From 76c4b7b93727d2af5bdf38e02c09a9b1b6dbe1f9 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 7 Jun 2013 14:58:35 +0000
Subject: [PATCH] Consistently apply the newer convention that template beans
 which directly instantiate classes are named after the class.

---
 mdx/at_aconet/beans.xml     |   4 +-
 mdx/at_aconet/verbs.xml     |   6 +-
 mdx/au_aaf/beans.xml        |   4 +-
 mdx/au_aaf/verbs.xml        |   6 +-
 mdx/be_belnet/beans.xml     |   8 +-
 mdx/be_belnet/verbs.xml     |  10 +--
 mdx/br_cafe/beans.xml       |   8 +-
 mdx/br_cafe/verbs.xml       |  10 +--
 mdx/ca_caf/beans.xml        |   8 +-
 mdx/ca_caf/verbs.xml        |  10 +--
 mdx/ch_switchaai/beans.xml  |   8 +-
 mdx/ch_switchaai/verbs.xml  |  10 +--
 mdx/common-beans.xml        | 130 +++++++++++++++---------------
 mdx/cz_eduid/beans.xml      |  10 +--
 mdx/cz_eduid/verbs.xml      |  10 +--
 mdx/de_dfnaai/beans.xml     |   8 +-
 mdx/de_dfnaai/verbs.xml     |  10 +--
 mdx/dk_wayf/beans.xml       |  14 ++--
 mdx/dk_wayf/verbs.xml       |  10 +--
 mdx/es_sir/beans.xml        |   8 +-
 mdx/es_sir/verbs.xml        |  10 +--
 mdx/eu_clarin/beans.xml     |   4 +-
 mdx/eu_clarin/verbs.xml     |   6 +-
 mdx/fi_haka/beans.xml       |   8 +-
 mdx/fi_haka/verbs.xml       |  10 +--
 mdx/fr_renater/beans.xml    |  10 +--
 mdx/fr_renater/verbs.xml    |  10 +--
 mdx/gr_grnet/beans.xml      |   8 +-
 mdx/gr_grnet/verbs.xml      |  10 +--
 mdx/hr_eduhr/beans.xml      |   4 +-
 mdx/hr_eduhr/verbs.xml      |   6 +-
 mdx/hu_eduid/beans.xml      |  10 +--
 mdx/hu_eduid/verbs.xml      |  10 +--
 mdx/ie_edugate/beans.xml    |   8 +-
 mdx/ie_edugate/verbs.xml    |   8 +-
 mdx/in_infed/beans.xml      |   4 +-
 mdx/in_infed/verbs.xml      |   6 +-
 mdx/int_edugain/beans.xml   |   8 +-
 mdx/int_edugain/verbs.xml   |   8 +-
 mdx/int_testshib/beans.xml  |   4 +-
 mdx/int_testshib/verbs.xml  |   6 +-
 mdx/it_idem/beans.xml       |   8 +-
 mdx/it_idem/verbs.xml       |  10 +--
 mdx/jp_gakunin/beans.xml    |   4 +-
 mdx/jp_gakunin/verbs.xml    |   6 +-
 mdx/lv_laife/beans.xml      |   8 +-
 mdx/lv_laife/verbs.xml      |  10 +--
 mdx/nl_surfconext/beans.xml |   6 +-
 mdx/nl_surfconext/verbs.xml |   6 +-
 mdx/nl_surfnet/beans.xml    |  10 +--
 mdx/nl_surfnet/verbs.xml    |  10 +--
 mdx/no_feide/beans.xml      |  10 +--
 mdx/no_feide/verbs.xml      |  10 +--
 mdx/nz_tuakiri/beans.xml    |   4 +-
 mdx/nz_tuakiri/verbs.xml    |   6 +-
 mdx/se_swamid/beans.xml     |   8 +-
 mdx/se_swamid/verbs.xml     |  10 +--
 mdx/si_arnes/beans.xml      |   4 +-
 mdx/si_arnes/verbs.xml      |   6 +-
 mdx/test/beans.xml          |   2 +-
 mdx/test/verbs.xml          |   6 +-
 mdx/uk/beans.xml            |  52 ++++++------
 mdx/uk/collect.xml          |   4 +-
 mdx/uk/generate.xml         |  86 ++++++++++----------
 mdx/uk/verbs.xml            |  32 ++++----
 mdx/uk_eduserv/beans.xml    |   4 +-
 mdx/uk_eduserv/verbs.xml    |   6 +-
 mdx/us_incommon/beans.xml   |   8 +-
 mdx/us_incommon/verbs.xml   |  10 +--
 mdx/validation-beans.xml    | 152 ++++++++++++++++++------------------
 70 files changed, 474 insertions(+), 474 deletions(-)

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index fd5f3f09..11db6bc1 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" parent="domResourceStage_parent"
+    <bean id="at_aconet_productionAggregate" parent="DomResourceSourceStage"
         p:id="at_aconet_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="at_aconet_exportedEntities" parent="composite_parent"
+    <bean id="at_aconet_exportedEntities" parent="CompositeStage"
         p:id="at_aconet_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index 0f538c6f..c3456823 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:at_aconet/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index 25233449..b28df637 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="au_aaf_productionAggregate" parent="domResourceStage_parent"
+    <bean id="au_aaf_productionAggregate" parent="DomResourceSourceStage"
         p:id="au_aaf_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="au_aaf_exportedEntities" parent="composite_parent"
+    <bean id="au_aaf_exportedEntities" parent="CompositeStage"
         p:id="au_aaf_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
index c12ade25..d2ea2719 100644
--- a/mdx/au_aaf/verbs.xml
+++ b/mdx/au_aaf/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:au_aaf/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
index 966628a5..a5c85825 100644
--- a/mdx/be_belnet/beans.xml
+++ b/mdx/be_belnet/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="be_belnet_productionAggregate" parent="domResourceStage_parent"
+    <bean id="be_belnet_productionAggregate" parent="DomResourceSourceStage"
         p:id="be_belnet_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="be_belnet_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="be_belnet_edugainAggregate" parent="DomResourceSourceStage"
         p:id="be_belnet_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="be_belnet_productionEntities" parent="composite_parent"
+    <bean id="be_belnet_productionEntities" parent="CompositeStage"
         p:id="be_belnet_productionEntities">
         <property name="composedStages">
             <list>
@@ -100,7 +100,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="be_belnet_edugainEntities" parent="composite_parent"
+    <bean id="be_belnet_edugainEntities" parent="CompositeStage"
         p:id="be_belnet_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
index 229fa12a..9c29e9ce 100644
--- a/mdx/be_belnet/verbs.xml
+++ b/mdx/be_belnet/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:be_belnet/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index 3f420317..1f9e6f03 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="br_cafe_productionAggregate" parent="domResourceStage_parent"
+    <bean id="br_cafe_productionAggregate" parent="DomResourceSourceStage"
         p:id="br_cafe_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="br_cafe_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="br_cafe_edugainAggregate" parent="DomResourceSourceStage"
         p:id="br_cafe_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="br_cafe_productionEntities" parent="composite_parent"
+    <bean id="br_cafe_productionEntities" parent="CompositeStage"
         p:id="br_cafe_productionEntities">
         <property name="composedStages">
             <list>
@@ -99,7 +99,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="br_cafe_edugainEntities" parent="composite_parent"
+    <bean id="br_cafe_edugainEntities" parent="CompositeStage"
         p:id="br_cafe_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
index cf2bde82..0e43d133 100644
--- a/mdx/br_cafe/verbs.xml
+++ b/mdx/br_cafe/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:br_cafe/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index 9740b876..059e1697 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ca_caf_productionAggregate" parent="domResourceStage_parent"
+    <bean id="ca_caf_productionAggregate" parent="DomResourceSourceStage"
         p:id="ca_caf_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ca_caf_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="ca_caf_edugainAggregate" parent="DomResourceSourceStage"
         p:id="ca_caf_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -95,7 +95,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="ca_caf_productionEntities" parent="composite_parent"
+    <bean id="ca_caf_productionEntities" parent="CompositeStage"
         p:id="ca_caf_productionEntities">
         <property name="composedStages">
             <list>
@@ -124,7 +124,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="ca_caf_edugainEntities" parent="composite_parent"
+    <bean id="ca_caf_edugainEntities" parent="CompositeStage"
         p:id="ca_caf_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
index 4e3835dd..3241e337 100644
--- a/mdx/ca_caf/verbs.xml
+++ b/mdx/ca_caf/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:ca_caf/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index 71ceac41..a26ca688 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ch_switchaai_productionAggregate" parent="domResourceStage_parent"
+    <bean id="ch_switchaai_productionAggregate" parent="DomResourceSourceStage"
         p:id="ch_switchaai_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ch_switchaai_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="ch_switchaai_edugainAggregate" parent="DomResourceSourceStage"
         p:id="ch_switchaai_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -91,7 +91,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="ch_switchaai_productionEntities" parent="composite_parent"
+    <bean id="ch_switchaai_productionEntities" parent="CompositeStage"
         p:id="ch_switchaai_productionEntities">
         <property name="composedStages">
             <list>
@@ -120,7 +120,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="ch_switchaai_edugainEntities" parent="composite_parent"
+    <bean id="ch_switchaai_edugainEntities" parent="CompositeStage"
         p:id="ch_switchaai_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
index aac8f2e2..830cf74d 100644
--- a/mdx/ch_switchaai/verbs.xml
+++ b/mdx/ch_switchaai/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:ch_switchaai/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 22d1d085..187b02ee 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -34,19 +34,19 @@
     <bean id="component_parent" abstract="true" init-method="initialize"/>
     
     <!--
-        FilesystemResource / file_parent
+        FilesystemResource
         
         Parent for all file system resource beans.
     -->
-    <bean id="FilesystemResource" name="file_parent" abstract="true" parent="component_parent"
+    <bean id="FilesystemResource" abstract="true" parent="component_parent"
         class="net.shibboleth.utilities.java.support.resource.FilesystemResource"/>
 
     <!--
-        pipeline_parent
+        SimplePipeline
         
         Parent for pipelines.
     -->
-    <bean id="pipeline_parent" abstract="true" parent="component_parent"
+    <bean id="SimplePipeline" abstract="true" parent="component_parent"
         class="net.shibboleth.metadata.pipeline.SimplePipeline"/>
     
     <!--
@@ -57,89 +57,89 @@
     <bean id="stage_parent" abstract="true" parent="component_parent"/>
     
     <!--
-        composite_parent
+        CompositeStage
         
         Parent for composite stages.
     -->
-    <bean id="composite_parent" abstract="true" parent="stage_parent"
+    <bean id="CompositeStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.pipeline.CompositeStage"/>
 
     <!--
-        xslt_parent
+        XSLTransformationStage
         
         Parent for XSLT-based checking stages.
     -->
-    <bean id="xslt_parent" abstract="true" parent="stage_parent"
+    <bean id="XSLTransformationStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.XSLTransformationStage"/>
     
     <!--
-        XSLValidationStage / check_xslt_parent
+        XSLValidationStage
         
         Parent for XSLT-based checking stages.
     -->
-    <bean id="XSLValidationStage" name="check_xslt_parent" abstract="true" parent="stage_parent"
+    <bean id="XSLValidationStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.XSLValidationStage"/>
     
     <!--
-        stripContainer_parent
+        EmptyContainerStrippingStage
         
         Parent for container stripping stages.
     -->
-    <bean id="stripContainer_parent" abstract="true" parent="stage_parent"
+    <bean id="EmptyContainerStrippingStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.EmptyContainerStrippingStage"/>
     
     <!--
-        stripElement_parent
+        ElementStrippingStage
         
         Parent for element stripping stages.
     -->
-    <bean id="stripElement_parent" abstract="true" parent="stage_parent"
+    <bean id="ElementStrippingStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.ElementStrippingStage"/>
     
     <!--
-        stripNamespace_parent
+        NamespaceStrippingStage
         
         Parent for namespace stripping stages.
     -->
-    <bean id="stripNamespace_parent" abstract="true" parent="stage_parent"
+    <bean id="NamespaceStrippingStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.NamespaceStrippingStage"/>
 
     <!--
-        domFileStage_parent
+        DomFilesystemSourceStage
         
         Parent for DOM filesystem source stages.
     -->
-    <bean id="domFileStage_parent" abstract="true" parent="stage_parent"
+    <bean id="DomFilesystemSourceStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
     <!--
-        domResourceStage_parent
+        DomResourceSourceStage
         
         Parent for DOM resource source stages.
     -->
-    <bean id="domResourceStage_parent" abstract="true" parent="stage_parent"
+    <bean id="DomResourceSourceStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.DomResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
     <!--
-        serialize_parent
+        SerializationStage
         
         Parent for serialization stages.
     -->
-    <bean id="serialize_parent" abstract="true" parent="stage_parent"
+    <bean id="SerializationStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.pipeline.SerializationStage">
         <property name="serializer" ref="serializer"/>
     </bean>
     
     <!--
-        merge_parent
+        PipelineMergeStage
         
         Parent for merge stages.  Defaults strategy to deduplication.
     -->
-    <bean id="merge_parent" abstract="true" parent="stage_parent"
+    <bean id="PipelineMergeStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.pipeline.PipelineMergeStage">
         <property name="collectionMergeStrategy" ref="deduplicateMergeStrategy"/>
     </bean>
@@ -220,7 +220,7 @@
         
         Remove the Eduserv label namespace.
     -->
-    <bean id="stripElabNamespace" parent="stripNamespace_parent"
+    <bean id="stripElabNamespace" parent="NamespaceStrippingStage"
         p:id="stripElabNamespace" p:namespace-ref="elab_namespace"/>
 
     <!--
@@ -228,7 +228,7 @@
         
         Remove the namespace used by the entity attributes extension.
     -->
-    <bean id="stripMdattrNamespace" parent="stripNamespace_parent"
+    <bean id="stripMdattrNamespace" parent="NamespaceStrippingStage"
         p:id="stripMdattrNamespace" p:namespace-ref="mdattr_namespace"/>
     
     <!--
@@ -236,7 +236,7 @@
         
         Remove the namespace used by the registration and publication metdata extension.
     -->
-    <bean id="stripMdrpiNamespace" parent="stripNamespace_parent"
+    <bean id="stripMdrpiNamespace" parent="NamespaceStrippingStage"
         p:id="stripMdrpiNamespace" p:namespace-ref="mdrpi_namespace"/>
     
     <!--
@@ -244,7 +244,7 @@
         
         Remove the UK federation label namespace.
     -->
-    <bean id="stripUkfedlabelNamespace" parent="stripNamespace_parent"
+    <bean id="stripUkfedlabelNamespace" parent="NamespaceStrippingStage"
         p:id="stripUkfedlabelNamespace" p:namespace-ref="ukfedlabel_namespace"/>
     
     <!--
@@ -252,7 +252,7 @@
         
         Remove the UK federation WAYF namespace.
     -->
-    <bean id="stripWayfNamespace" parent="stripNamespace_parent"
+    <bean id="stripWayfNamespace" parent="NamespaceStrippingStage"
         p:id="stripWayfNamespace" p:namespace-ref="wayf_namespace"/>
     
     <!--
@@ -261,10 +261,10 @@
         A pipeline stage that can be used before serialisation to normalise the namespaces
         used in an XML document.
     -->
-    <bean id="normaliseNamespaces" parent="xslt_parent"
+    <bean id="normaliseNamespaces" parent="XSLTransformationStage"
         p:id="normaliseNamespaces">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ns_norm.xsl"/>
             </bean>
         </property>
@@ -346,7 +346,7 @@
         Announce any errors or warnings encountered, then remove
         any items that had errors.  Items with warnings are retained.
     -->
-    <bean id="errorAnnouncingFilter" parent="composite_parent"
+    <bean id="errorAnnouncingFilter" parent="CompositeStage"
         p:id="errorAnnouncingFilter">
         <property name="composedStages">
             <list>
@@ -362,7 +362,7 @@
         A pipeline stage that checks for any errors, and then announces
         and filters any encountered.
     -->
-    <bean id="errorTerminatingFilter" parent="composite_parent"
+    <bean id="errorTerminatingFilter" parent="CompositeStage"
         p:id="errorTerminatingFilter">
         <property name="composedStages">
             <list>
@@ -388,9 +388,9 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="default_regauth_parent" abstract="true" parent="xslt_parent">
+    <bean id="default_regauth_parent" abstract="true" parent="XSLTransformationStage">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/default_regauth.xsl"/>
             </bean>
         </property>
@@ -438,76 +438,76 @@
     -->
     <util:list id="schemaResources">
         <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['basedir'] }/xml/incommon-metadata.xsd"/>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/MetadataExchange.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-metadata-rpi-v1.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-schema-assertion-2.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-schema-metadata-2.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/shibboleth-metadata-1.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-metadata-attr.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-request-initiation.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-holder-of-key-browser-sso.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-idp-discovery.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-metadata-algsupport-v1.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-metadata-ui-v1.0.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/uk-fed-label.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-members.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-addr.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-authorization.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-federation.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-securitypolicy-1.2.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xenc-schema.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xenc-schema-11.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xml.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xmldsig-core-schema.xsd"/>
         </bean>
-        <bean parent="file_parent">
+        <bean parent="FilesystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xmldsig11-schema.xsd"/>
         </bean>
     </util:list>
@@ -530,10 +530,10 @@
         presented, for example by removing redundant attributes or elements which only have
         meaning when added by the UK federation registrar.
     -->
-    <bean id="cleanImport" parent="xslt_parent"
+    <bean id="cleanImport" parent="XSLTransformationStage"
         p:id="cleanImport">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/clean-import.xsl"/>
             </bean>
         </property>
@@ -558,7 +558,7 @@
         
         Remove all ds:KeyName elements.
     -->
-    <bean id="stripKeyNames" parent="stripElement_parent"
+    <bean id="stripKeyNames" parent="ElementStrippingStage"
         p:id="stripKeyNames"
         p:elementName="KeyName"
         p:elementNamespace="http://www.w3.org/2000/09/xmldsig#"/>
@@ -566,7 +566,7 @@
     <!--
         Remove any empty Extensions elements.
     -->
-    <bean id="removeEmptyExtensions" parent="stripContainer_parent"
+    <bean id="removeEmptyExtensions" parent="EmptyContainerStrippingStage"
         p:id="removeEmptyExtensions"
         p:elementName="Extensions"
         p:elementNamespace="urn:oasis:names:tc:SAML:2.0:metadata"/>
@@ -578,7 +578,7 @@
         collection has been acquired, had its signature validated, and disassembled into
         individual entities.
     -->
-    <bean id="standardImportActions" parent="composite_parent"
+    <bean id="standardImportActions" parent="CompositeStage"
         p:id="standardImportActions">
         <property name="composedStages">
             <list>
@@ -616,7 +616,7 @@
         are currently ending up in files, build an EntitiesDescriptor and normalise the
         namespaces in the document ready for serialisation.
     -->
-    <bean id="standardImportTail" parent="composite_parent"
+    <bean id="standardImportTail" parent="CompositeStage"
         p:id="standardImportTail">
         <property name="composedStages">
             <list>
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index 800af98d..6a32befe 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -35,7 +35,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="cz_eduid_productionAggregate" parent="domResourceStage_parent"
+    <bean id="cz_eduid_productionAggregate" parent="DomResourceSourceStage"
         p:id="cz_eduid_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="cz_eduid_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="cz_eduid_edugainAggregate" parent="DomResourceSourceStage"
         p:id="cz_eduid_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -81,14 +81,14 @@
     <!--
         Remove the eduID.cz custom metadata tagging namespace.
     -->
-    <bean id="cz_eduid_stripMetadataNamespace" parent="stripNamespace_parent"
+    <bean id="cz_eduid_stripMetadataNamespace" parent="NamespaceStrippingStage"
         p:id="cz_eduid_stripMetadataNamespace"
         p:namespace="http://eduid.cz/schema/metadata/1.0"/>
     
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="cz_eduid_productionEntities" parent="composite_parent"
+    <bean id="cz_eduid_productionEntities" parent="CompositeStage"
         p:id="cz_eduid_productionEntities">
         <property name="composedStages">
             <list>
@@ -119,7 +119,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="cz_eduid_edugainEntities" parent="composite_parent"
+    <bean id="cz_eduid_edugainEntities" parent="CompositeStage"
         p:id="cz_eduid_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
index be8174f2..cf4804bd 100644
--- a/mdx/cz_eduid/verbs.xml
+++ b/mdx/cz_eduid/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:cz_eduid/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index 6c9ee45f..2ed04914 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="de_dfnaai_productionAggregate" parent="domResourceStage_parent"
+    <bean id="de_dfnaai_productionAggregate" parent="DomResourceSourceStage"
         p:id="de_dfnaai_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="de_dfnaai_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="de_dfnaai_edugainAggregate" parent="DomResourceSourceStage"
         p:id="de_dfnaai_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="de_dfnaai_productionEntities" parent="composite_parent"
+    <bean id="de_dfnaai_productionEntities" parent="CompositeStage"
         p:id="de_dfnaai_productionEntities">
         <property name="composedStages">
             <list>
@@ -100,7 +100,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="de_dfnaai_edugainEntities" parent="composite_parent"
+    <bean id="de_dfnaai_edugainEntities" parent="CompositeStage"
         p:id="de_dfnaai_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
index 1a225067..31fcf339 100644
--- a/mdx/de_dfnaai/verbs.xml
+++ b/mdx/de_dfnaai/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:de_dfnaai/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 43ee1353..095f803e 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -34,7 +34,7 @@
     <!--
         Fetch the IdP metadata.
     -->
-    <bean id="dk_wayf_idpMetadata" parent="domResourceStage_parent"
+    <bean id="dk_wayf_idpMetadata" parent="DomResourceSourceStage"
         p:id="dk_wayf_idpMetadata">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -47,7 +47,7 @@
     <!--
         Fetch the SP metadata.
     -->
-    <bean id="dk_wayf_spMetadata" parent="domResourceStage_parent"
+    <bean id="dk_wayf_spMetadata" parent="DomResourceSourceStage"
         p:id="dk_wayf_spMetadata">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -62,7 +62,7 @@
         
         See http://wayf.dk/en/services/connection-technology-for-services/412
     -->
-    <bean id="dk_wayf_birkMetadata" parent="domResourceStage_parent"
+    <bean id="dk_wayf_birkMetadata" parent="DomResourceSourceStage"
         p:id="dk_wayf_birkMetadata">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -75,7 +75,7 @@
     <!--
         Synthesise a production aggregate.
     -->
-    <bean id="dk_wayf_productionAggregate" parent="composite_parent"
+    <bean id="dk_wayf_productionAggregate" parent="CompositeStage"
         p:id="dk_wayf_productionAggregate">
         <property name="composedStages">
             <list>
@@ -96,7 +96,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="dk_wayf_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="dk_wayf_edugainAggregate" parent="DomResourceSourceStage"
         p:id="dk_wayf_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -131,7 +131,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="dk_wayf_productionEntities" parent="composite_parent"
+    <bean id="dk_wayf_productionEntities" parent="CompositeStage"
         p:id="dk_wayf_productionEntities">
         <property name="composedStages">
             <list>
@@ -155,7 +155,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="dk_wayf_edugainEntities" parent="composite_parent"
+    <bean id="dk_wayf_edugainEntities" parent="CompositeStage"
         p:id="dk_wayf_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/dk_wayf/verbs.xml b/mdx/dk_wayf/verbs.xml
index 8c4d47fb..f1b34bc0 100644
--- a/mdx/dk_wayf/verbs.xml
+++ b/mdx/dk_wayf/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:dk_wayf/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index 70407bfe..c7b9f556 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="es_sir_productionAggregate" parent="domResourceStage_parent"
+    <bean id="es_sir_productionAggregate" parent="DomResourceSourceStage"
         p:id="es_sir_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="es_sir_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="es_sir_edugainAggregate" parent="DomResourceSourceStage"
         p:id="es_sir_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="es_sir_productionEntities" parent="composite_parent"
+    <bean id="es_sir_productionEntities" parent="CompositeStage"
         p:id="es_sir_productionEntities">
         <property name="composedStages">
             <list>
@@ -100,7 +100,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="es_sir_edugainEntities" parent="composite_parent"
+    <bean id="es_sir_edugainEntities" parent="CompositeStage"
         p:id="es_sir_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
index 4699f745..897336eb 100644
--- a/mdx/es_sir/verbs.xml
+++ b/mdx/es_sir/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:es_sir/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
index f5085144..c76bcf75 100644
--- a/mdx/eu_clarin/beans.xml
+++ b/mdx/eu_clarin/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="eu_clarin_exportAggregate" parent="domResourceStage_parent"
+    <bean id="eu_clarin_exportAggregate" parent="DomResourceSourceStage"
         p:id="eu_clarin_exportAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -28,7 +28,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="eu_clarin_exportedEntities" parent="composite_parent"
+    <bean id="eu_clarin_exportedEntities" parent="CompositeStage"
         p:id="eu_clarin_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/eu_clarin/verbs.xml b/mdx/eu_clarin/verbs.xml
index b42b959d..f2b6dd64 100644
--- a/mdx/eu_clarin/verbs.xml
+++ b/mdx/eu_clarin/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:eu_clarin/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 08e3c86e..34a84487 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fi_haka_productionAggregate" parent="domResourceStage_parent"
+    <bean id="fi_haka_productionAggregate" parent="DomResourceSourceStage"
         p:id="fi_haka_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="fi_haka_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="fi_haka_edugainAggregate" parent="DomResourceSourceStage"
         p:id="fi_haka_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -91,7 +91,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="fi_haka_productionEntities" parent="composite_parent"
+    <bean id="fi_haka_productionEntities" parent="CompositeStage"
         p:id="fi_haka_productionEntities">
         <property name="composedStages">
             <list>
@@ -120,7 +120,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="fi_haka_edugainEntities" parent="composite_parent"
+    <bean id="fi_haka_edugainEntities" parent="CompositeStage"
         p:id="fi_haka_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
index 066d4a2b..ead07e16 100644
--- a/mdx/fi_haka/verbs.xml
+++ b/mdx/fi_haka/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:fi_haka/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index 554b782e..24734f5e 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -28,7 +28,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fr_renater_productionAggregate" parent="domResourceStage_parent"
+    <bean id="fr_renater_productionAggregate" parent="DomResourceSourceStage"
         p:id="fr_renater_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -41,7 +41,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="fr_renater_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="fr_renater_edugainAggregate" parent="DomResourceSourceStage"
         p:id="fr_renater_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -54,7 +54,7 @@
     <!--
         Fetch the test aggregate.
     -->
-    <bean id="fr_renater_testAggregate" parent="domResourceStage_parent"
+    <bean id="fr_renater_testAggregate" parent="DomResourceSourceStage"
         p:id="fr_renater_testAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -146,7 +146,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="fr_renater_productionEntities" parent="composite_parent"
+    <bean id="fr_renater_productionEntities" parent="CompositeStage"
         p:id="fr_renater_productionEntities">
         <property name="composedStages">
             <list>
@@ -179,7 +179,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="fr_renater_edugainEntities" parent="composite_parent"
+    <bean id="fr_renater_edugainEntities" parent="CompositeStage"
         p:id="fr_renater_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/fr_renater/verbs.xml b/mdx/fr_renater/verbs.xml
index 1f9ff350..81018363 100644
--- a/mdx/fr_renater/verbs.xml
+++ b/mdx/fr_renater/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:fr_renater/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index 0fab3576..6731c6d5 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="gr_grnet_productionAggregate" parent="domResourceStage_parent"
+    <bean id="gr_grnet_productionAggregate" parent="DomResourceSourceStage"
         p:id="gr_grnet_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="gr_grnet_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="gr_grnet_edugainAggregate" parent="DomResourceSourceStage"
         p:id="gr_grnet_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="gr_grnet_productionEntities" parent="composite_parent"
+    <bean id="gr_grnet_productionEntities" parent="CompositeStage"
         p:id="gr_grnet_productionEntities">
         <property name="composedStages">
             <list>
@@ -100,7 +100,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="gr_grnet_edugainEntities" parent="composite_parent"
+    <bean id="gr_grnet_edugainEntities" parent="CompositeStage"
         p:id="gr_grnet_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
index ce852fcb..e9d7b7b5 100644
--- a/mdx/gr_grnet/verbs.xml
+++ b/mdx/gr_grnet/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:gr_grnet/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index 3814fa9d..cc6b2dea 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -22,7 +22,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="hr_eduhr_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="hr_eduhr_edugainAggregate" parent="DomResourceSourceStage"
         p:id="hr_eduhr_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -94,7 +94,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="hr_eduhr_edugainEntities" parent="composite_parent"
+    <bean id="hr_eduhr_edugainEntities" parent="CompositeStage"
         p:id="hr_eduhr_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/hr_eduhr/verbs.xml b/mdx/hr_eduhr/verbs.xml
index 46c8dfdb..8cd16b82 100644
--- a/mdx/hr_eduhr/verbs.xml
+++ b/mdx/hr_eduhr/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:hr_eduhr/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index b3eec02f..bf4f914d 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="hu_eduid_productionAggregate" parent="domResourceStage_parent"
+    <bean id="hu_eduid_productionAggregate" parent="DomResourceSourceStage"
         p:id="hu_eduid_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="hu_eduid_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="hu_eduid_edugainAggregate" parent="DomResourceSourceStage"
         p:id="hu_eduid_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Remove the eduID.hu custom metadata tagging namespace.
     -->
-    <bean id="hu_eduid_stripEntityAttributesNamespace" parent="stripNamespace_parent"
+    <bean id="hu_eduid_stripEntityAttributesNamespace" parent="NamespaceStrippingStage"
         p:id="hu_eduid_stripEntityAttributesNamespace"
         p:namespace="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info"/>
 
@@ -102,7 +102,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="hu_eduid_productionEntities" parent="composite_parent"
+    <bean id="hu_eduid_productionEntities" parent="CompositeStage"
         p:id="hu_eduid_productionEntities">
         <property name="composedStages">
             <list>
@@ -134,7 +134,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="hu_eduid_edugainEntities" parent="composite_parent"
+    <bean id="hu_eduid_edugainEntities" parent="CompositeStage"
         p:id="hu_eduid_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
index 82bf4c9e..2fe1aa14 100644
--- a/mdx/hu_eduid/verbs.xml
+++ b/mdx/hu_eduid/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:hu_eduid/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index a522f6de..5570cbcc 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="ie_edugate_exportAggregate" parent="domResourceStage_parent"
+    <bean id="ie_edugate_exportAggregate" parent="DomResourceSourceStage"
         p:id="ie_edugate_exportAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -28,7 +28,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ie_edugate_productionAggregate" parent="domResourceStage_parent"
+    <bean id="ie_edugate_productionAggregate" parent="DomResourceSourceStage"
         p:id="ie_edugate_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -120,7 +120,7 @@
     <!--
         Fetch and process all entities as a collection.
     -->
-    <bean id="ie_edugate_allEntities" parent="composite_parent"
+    <bean id="ie_edugate_allEntities" parent="CompositeStage"
         p:id="ie_edugate_allEntities">
         <property name="composedStages">
             <list>
@@ -150,7 +150,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="ie_edugate_exportedEntities" parent="composite_parent"
+    <bean id="ie_edugate_exportedEntities" parent="CompositeStage"
         p:id="ie_edugate_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
index 80711b33..6d92bcb1 100644
--- a/mdx/ie_edugate/verbs.xml
+++ b/mdx/ie_edugate/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:ie_edugate/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importAll" parent="pipeline_parent"
+    <bean id="importAll" parent="SimplePipeline"
         p:id="importAll">
         <property name="stages">
             <list>
@@ -53,7 +53,7 @@
         </property>
     </bean>
     
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/in_infed/beans.xml b/mdx/in_infed/beans.xml
index b0a7b0ef..064d4289 100644
--- a/mdx/in_infed/beans.xml
+++ b/mdx/in_infed/beans.xml
@@ -22,7 +22,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="in_infed_productionAggregate" parent="domResourceStage_parent"
+    <bean id="in_infed_productionAggregate" parent="DomResourceSourceStage"
         p:id="in_infed_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -35,7 +35,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="in_infed_productionEntities" parent="composite_parent"
+    <bean id="in_infed_productionEntities" parent="CompositeStage"
         p:id="in_infed_productionEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/in_infed/verbs.xml b/mdx/in_infed/verbs.xml
index a02e988e..1e723a7d 100644
--- a/mdx/in_infed/verbs.xml
+++ b/mdx/in_infed/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:in_infed/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 58e18d5d..ea3424c3 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -21,7 +21,7 @@
     <!--
         Fetch the eduGAIN test aggregate.
     -->
-    <bean id="int_edugain_testAggregate" parent="domResourceStage_parent"
+    <bean id="int_edugain_testAggregate" parent="DomResourceSourceStage"
         p:id="int_edugain_testAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -34,7 +34,7 @@
     <!--
         Fetches the eduGAIN production aggregate.
     -->
-    <bean id="int_edugain_productionAggregate" parent="domResourceStage_parent"
+    <bean id="int_edugain_productionAggregate" parent="DomResourceSourceStage"
         p:id="int_edugain_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -67,7 +67,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="int_edugain_exportedEntities" parent="composite_parent"
+    <bean id="int_edugain_exportedEntities" parent="CompositeStage"
         p:id="int_edugain_exportedEntities">
         <property name="composedStages">
             <list>
@@ -108,7 +108,7 @@
     <!--
         Fetch and process the test entities as a collection.
     -->
-    <bean id="int_edugain_testEntities" parent="composite_parent"
+    <bean id="int_edugain_testEntities" parent="CompositeStage"
         p:id="int_edugain_testEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 9cc5f724..e480a724 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:int_edugain/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="testImport" parent="pipeline_parent"
+    <bean id="testImport" parent="SimplePipeline"
         p:id="testImport">
         <property name="stages">
             <list>
diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
index 6b3a0512..e3b165e9 100644
--- a/mdx/int_testshib/beans.xml
+++ b/mdx/int_testshib/beans.xml
@@ -22,7 +22,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="int_testshib_productionAggregate" parent="domResourceStage_parent"
+    <bean id="int_testshib_productionAggregate" parent="DomResourceSourceStage"
         p:id="int_testshib_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -35,7 +35,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="int_testshib_productionEntities" parent="composite_parent"
+    <bean id="int_testshib_productionEntities" parent="CompositeStage"
         p:id="int_testshib_productionEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
index 0c928a19..2a70799b 100644
--- a/mdx/int_testshib/verbs.xml
+++ b/mdx/int_testshib/verbs.xml
@@ -25,7 +25,7 @@
     <!--
         Serialise into this channel's "imported" aggregate file.
     -->
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -34,7 +34,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -45,7 +45,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 34ee4843..e887f720 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="it_idem_productionAggregate" parent="domResourceStage_parent"
+    <bean id="it_idem_productionAggregate" parent="DomResourceSourceStage"
         p:id="it_idem_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="it_idem_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="it_idem_edugainAggregate" parent="DomResourceSourceStage"
         p:id="it_idem_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="it_idem_productionEntities" parent="composite_parent"
+    <bean id="it_idem_productionEntities" parent="CompositeStage"
         p:id="it_idem_productionEntities">
         <property name="composedStages">
             <list>
@@ -100,7 +100,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="it_idem_edugainEntities" parent="composite_parent"
+    <bean id="it_idem_edugainEntities" parent="CompositeStage"
         p:id="it_idem_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
index 2f5abbee..d11edd7f 100644
--- a/mdx/it_idem/verbs.xml
+++ b/mdx/it_idem/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:it_idem/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index 7e6da524..8e448649 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="jp_gakunin_productionAggregate" parent="domResourceStage_parent"
+    <bean id="jp_gakunin_productionAggregate" parent="DomResourceSourceStage"
         p:id="jp_gakunin_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="jp_gakunin_exportedEntities" parent="composite_parent"
+    <bean id="jp_gakunin_exportedEntities" parent="CompositeStage"
         p:id="jp_gakunin_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/jp_gakunin/verbs.xml b/mdx/jp_gakunin/verbs.xml
index 0b05de12..7b69ba0a 100644
--- a/mdx/jp_gakunin/verbs.xml
+++ b/mdx/jp_gakunin/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:jp_gakunin/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index 6856450f..93e3d2b4 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="lv_laife_productionAggregate" parent="domResourceStage_parent"
+    <bean id="lv_laife_productionAggregate" parent="DomResourceSourceStage"
         p:id="lv_laife_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="lv_laife_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="lv_laife_edugainAggregate" parent="DomResourceSourceStage"
         p:id="lv_laife_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -74,7 +74,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="lv_laife_productionEntities" parent="composite_parent"
+    <bean id="lv_laife_productionEntities" parent="CompositeStage"
         p:id="lv_laife_productionEntities">
         <property name="composedStages">
             <list>
@@ -103,7 +103,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="lv_laife_edugainEntities" parent="composite_parent"
+    <bean id="lv_laife_edugainEntities" parent="CompositeStage"
         p:id="lv_laife_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/lv_laife/verbs.xml b/mdx/lv_laife/verbs.xml
index f3cd2204..7c845f70 100644
--- a/mdx/lv_laife/verbs.xml
+++ b/mdx/lv_laife/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:lv_laife/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index 2b8019a2..85250402 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -43,7 +43,7 @@
     <!--
         Fetch the IdP aggregate.
     -->
-    <bean id="nl_surfconext_idpAggregate" parent="domResourceStage_parent"
+    <bean id="nl_surfconext_idpAggregate" parent="DomResourceSourceStage"
         p:id="nl_surfconext_idpAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -56,7 +56,7 @@
     <!--
         Fetch the SP aggregate.
     -->
-    <bean id="nl_surfconext_spAggregate" parent="domResourceStage_parent"
+    <bean id="nl_surfconext_spAggregate" parent="DomResourceSourceStage"
         p:id="nl_surfconext_spAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -69,7 +69,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="nl_surfconext_exportedEntities" parent="composite_parent"
+    <bean id="nl_surfconext_exportedEntities" parent="CompositeStage"
         p:id="nl_surfconext_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/nl_surfconext/verbs.xml b/mdx/nl_surfconext/verbs.xml
index d86d34bc..5977e8bd 100644
--- a/mdx/nl_surfconext/verbs.xml
+++ b/mdx/nl_surfconext/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:nl_surfconext/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -48,7 +48,7 @@
         Fetch the separate IdP and SP aggregates, disassemble them into individual entities
         and then build up a single aggregate from all combined.
     -->
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index eb914e8a..048a4b44 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -22,7 +22,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="nl_surfnet_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="nl_surfnet_edugainAggregate" parent="DomResourceSourceStage"
         p:id="nl_surfnet_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -55,7 +55,7 @@
     <!--
         Fetch the IdP aggregate.
     -->
-    <bean id="nl_surfnet_idpAggregate" parent="domResourceStage_parent"
+    <bean id="nl_surfnet_idpAggregate" parent="DomResourceSourceStage"
         p:id="nl_surfnet_idpAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -68,7 +68,7 @@
     <!--
         Fetch the SP aggregate.
     -->
-    <bean id="nl_surfnet_spAggregate" parent="domResourceStage_parent"
+    <bean id="nl_surfnet_spAggregate" parent="DomResourceSourceStage"
         p:id="nl_surfnet_spAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -83,7 +83,7 @@
         
         Fake this up by combining separate IdP and SP aggregates.
     -->
-    <bean id="nl_surfnet_productionEntities" parent="composite_parent"
+    <bean id="nl_surfnet_productionEntities" parent="CompositeStage"
         p:id="nl_surfnet_productionEntities">
         <property name="composedStages">
             <list>
@@ -113,7 +113,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="nl_surfnet_edugainEntities" parent="composite_parent"
+    <bean id="nl_surfnet_edugainEntities" parent="CompositeStage"
         p:id="nl_surfnet_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
index cbeffebd..c15c2f60 100644
--- a/mdx/nl_surfnet/verbs.xml
+++ b/mdx/nl_surfnet/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:nl_surfnet/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -48,7 +48,7 @@
         Fetch the separate IdP and SP aggregates, disassemble them into individual entities
         and then build up a single aggregate from all combined.
     -->
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -61,7 +61,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -72,7 +72,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index bb1c9a12..0d21ab9a 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -24,7 +24,7 @@
         
         FEIDE is a hub-and-spoke federation with a single IdP.  SP metadata is not published.
     -->
-    <bean id="no_feide_idpMetadata" parent="domResourceStage_parent"
+    <bean id="no_feide_idpMetadata" parent="DomResourceSourceStage"
         p:id="no_feide_idpMetadata">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -39,7 +39,7 @@
         
         There isn't one of these, so make one by wrapping the IdP metadata.
     -->
-    <bean id="no_feide_productionAggregate" parent="pipeline_parent"
+    <bean id="no_feide_productionAggregate" parent="SimplePipeline"
         p:id="no_feide_productionAggregate">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="no_feide_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="no_feide_edugainAggregate" parent="DomResourceSourceStage"
         p:id="no_feide_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -85,7 +85,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="no_feide_productionEntities" parent="composite_parent"
+    <bean id="no_feide_productionEntities" parent="CompositeStage"
         p:id="no_feide_productionEntities">
         <property name="composedStages">
             <list>
@@ -102,7 +102,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="no_feide_edugainEntities" parent="composite_parent"
+    <bean id="no_feide_edugainEntities" parent="CompositeStage"
         p:id="no_feide_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/no_feide/verbs.xml b/mdx/no_feide/verbs.xml
index 06fa72af..aa807b0b 100644
--- a/mdx/no_feide/verbs.xml
+++ b/mdx/no_feide/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:no_feide/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index 9d4bad1b..54794fea 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="nz_tuakiri_productionAggregate" parent="domResourceStage_parent"
+    <bean id="nz_tuakiri_productionAggregate" parent="DomResourceSourceStage"
         p:id="nz_tuakiri_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="nz_tuakiri_exportedEntities" parent="composite_parent"
+    <bean id="nz_tuakiri_exportedEntities" parent="CompositeStage"
         p:id="nz_tuakiri_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/nz_tuakiri/verbs.xml b/mdx/nz_tuakiri/verbs.xml
index c1cd8578..7ee365f6 100644
--- a/mdx/nz_tuakiri/verbs.xml
+++ b/mdx/nz_tuakiri/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:nz_tuakiri/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 8adfec9a..335fcbcc 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -31,7 +31,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="se_swamid_productionAggregate" parent="domResourceStage_parent"
+    <bean id="se_swamid_productionAggregate" parent="DomResourceSourceStage"
         p:id="se_swamid_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -44,7 +44,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="se_swamid_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="se_swamid_edugainAggregate" parent="DomResourceSourceStage"
         p:id="se_swamid_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -116,7 +116,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="se_swamid_productionEntities" parent="composite_parent"
+    <bean id="se_swamid_productionEntities" parent="CompositeStage"
         p:id="se_swamid_productionEntities">
         <property name="composedStages">
             <list>
@@ -158,7 +158,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="se_swamid_edugainEntities" parent="composite_parent"
+    <bean id="se_swamid_edugainEntities" parent="CompositeStage"
         p:id="se_swamid_edugainEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index af94a689..f046e023 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:se_swamid/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index 00ee0e10..87d6f21d 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the ARNES production aggregate.
     -->
-    <bean id="si_arnes_productionAggregate" parent="domResourceStage_parent"
+    <bean id="si_arnes_productionAggregate" parent="DomResourceSourceStage"
         p:id="si_arnes_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="si_arnes_exportedEntities" parent="composite_parent"
+    <bean id="si_arnes_exportedEntities" parent="CompositeStage"
         p:id="si_arnes_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/si_arnes/verbs.xml b/mdx/si_arnes/verbs.xml
index cc986497..998e0d5a 100644
--- a/mdx/si_arnes/verbs.xml
+++ b/mdx/si_arnes/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:si_arnes/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index facf1941..d5f495ed 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -29,7 +29,7 @@
     <!--
         Fetch and process the entities as a collection.
     -->
-    <bean id="test_entities" parent="composite_parent"
+    <bean id="test_entities" parent="CompositeStage"
         p:id="test_entities">
         <property name="composedStages">
             <list>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index ae3b66f7..36bdae84 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:test/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index eec45f1b..1bbb910c 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -43,7 +43,7 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="uk_exportAggregate" parent="domResourceStage_parent"
+    <bean id="uk_exportAggregate" parent="DomResourceSourceStage"
         p:id="uk_exportAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -57,7 +57,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="uk_productionAggregate" parent="domResourceStage_parent"
+    <bean id="uk_productionAggregate" parent="DomResourceSourceStage"
         p:id="uk_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -150,10 +150,10 @@
         This transform can be run on individual EntityDescriptors or on an
         aggregate EntitiesDescriptor.
     -->
-    <bean id="uk_processScopes" parent="xslt_parent"
+    <bean id="uk_processScopes" parent="XSLTransformationStage"
         p:id="uk_processScopes">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/scopes.xsl"/>
             </bean>
         </property>
@@ -170,7 +170,7 @@
         
         A Resource referencing the members.xml document.
     -->
-    <bean id="uk_membersResource" parent="file_parent">
+    <bean id="uk_membersResource" parent="FilesystemResource">
         <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
     </bean>
     
@@ -205,10 +205,10 @@
         
         Adds "mailto:" to md:EmailAddress elements which don't already have it.
     -->
-    <bean id="uk_fix_mailto" parent="xslt_parent"
+    <bean id="uk_fix_mailto" parent="XSLTransformationStage"
         p:id="uk_fix_mailto">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/fix_mailto.xsl"/>
             </bean>
         </property>
@@ -223,10 +223,10 @@
         Requires that IdPs already have EntityDescriptor/Extensions elements to put
         the HideFromWAYF element into.
     -->
-    <bean id="uk_hide_idps" parent="xslt_parent"
+    <bean id="uk_hide_idps" parent="XSLTransformationStage"
         p:id="uk_hide_idps">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/hide_idps.xsl"/>
             </bean>
         </property>
@@ -238,10 +238,10 @@
         
         Checks specific to the UK registrar function.
     -->
-    <bean id="check_ukreg" parent="check_xslt_parent"
+    <bean id="check_ukreg" parent="XSLValidationStage"
         p:id="check_ukreg">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_ukreg.xsl"/>
             </bean>
         </property>
@@ -261,7 +261,7 @@
     <bean id="uk_trustRootsDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean">
         <property name="parserPool" ref="parserPool"/>
         <property name="documentResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/xml/master.xml"/>
             </bean>
         </property>
@@ -273,10 +273,10 @@
         
         This stage adds the UK federation trust roots to an EntitiesDescriptor.
     -->
-    <bean id="uk_addTrustRoots" parent="xslt_parent"
+    <bean id="uk_addTrustRoots" parent="XSLTransformationStage"
         p:id="uk_addTrustRoots">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/trust-roots.xsl"/>
             </bean>
         </property>
@@ -293,10 +293,10 @@
         
         This stage performs any standard cleanup required for UK federation fragment files.
     -->
-    <bean id="uk_processFragment" parent="xslt_parent"
+    <bean id="uk_processFragment" parent="XSLTransformationStage"
         p:id="uk_processFragment">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/fragment.xsl"/>
             </bean>
         </property>
@@ -360,7 +360,7 @@
     <!--
         Fetch and process the registered entities as a collection.
     -->
-    <bean id="uk_registeredEntities" parent="composite_parent"
+    <bean id="uk_registeredEntities" parent="CompositeStage"
         p:id="uk_registeredEntities">
         <property name="composedStages">
             <list>
@@ -387,10 +387,10 @@
         
         Strip those UK federation extensions which we never publish.
     -->
-    <bean id="uk_stripExtensions" parent="xslt_parent"
+    <bean id="uk_stripExtensions" parent="XSLTransformationStage"
         p:id="uk_stripExtensions">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/strip_extensions.xsl"/>
             </bean>
         </property>
@@ -412,10 +412,10 @@
         used in an XML document.  This one is UK-specific, as it makes specific choices
         in order to limit the number of prefixes used.
     -->
-    <bean id="uk_normaliseNamespaces" parent="xslt_parent"
+    <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
         p:id="uk_normaliseNamespaces">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_uk.xsl"/>
             </bean>
         </property>
@@ -473,7 +473,7 @@
         Serialise the (assumed HTML) DomDocumentItem into the UK federation statistics
         output file in the production XML directory.
     -->
-    <bean id="uk_serializeStatistics" parent="serialize_parent"
+    <bean id="uk_serializeStatistics" parent="SerializationStage"
         p:id="uk_serializeStatistics">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -487,10 +487,10 @@
         
         Input is an aggregate of all registered entities, output is the HTML statistics.
     -->
-    <bean id="uk_generateStatistics" parent="xslt_parent"
+    <bean id="uk_generateStatistics" parent="XSLTransformationStage"
         p:id="uk_generateStatistics">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/statistics.xsl"/>
             </bean>
         </property>
@@ -509,7 +509,7 @@
         resulting HTML output is written into the appropriate file in the production
         XML directory.
     -->
-    <bean id="uk_statisticsPipeline" parent="pipeline_parent"
+    <bean id="uk_statisticsPipeline" parent="SimplePipeline"
         p:id="uk_statisticsPipeline">
         <property name="stages">
             <list>
@@ -531,7 +531,7 @@
     <!--
         Fetch and process the export entities as a collection.
     -->
-    <bean id="uk_exportedEntities" parent="composite_parent"
+    <bean id="uk_exportedEntities" parent="CompositeStage"
         p:id="uk_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index ba6d8ccd..6e0a31f1 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:uk/beans.xml"/>
 
-    <bean id="serializeCollected" parent="serialize_parent"
+    <bean id="serializeCollected" parent="SerializationStage"
         p:id="serializeCollected">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="collect" parent="pipeline_parent"
+    <bean id="collect" parent="SimplePipeline"
         p:id="collect">
         <property name="stages">
             <list>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 42eaa68d..43775482 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -44,10 +44,10 @@
         Remove entity-level Scope elements, leaving only the ones associated
         with role descriptors.    
     -->
-    <bean id="stripEntityScopes" parent="xslt_parent"
+    <bean id="stripEntityScopes" parent="XSLTransformationStage"
         p:id="stripEntityScopes">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/entity_scopes.xsl"/>
             </bean>
         </property>
@@ -87,7 +87,7 @@
         
         See https://wiki.shibboleth.net/confluence/display/SHIB2/MetadataCorrectness#MetadataCorrectness-Version20
     -->
-    <bean id="fixup_EncryptionMethod" parent="stripElement_parent"
+    <bean id="fixup_EncryptionMethod" parent="ElementStrippingStage"
         p:id="fixup_EncryptionMethod"
         p:elementName="EncryptionMethod"
         p:elementNamespace="urn:oasis:names:tc:SAML:2.0:metadata"/>
@@ -98,10 +98,10 @@
         Patch any @use-less KeyName descriptors in IdP roles
         for the benefit of Shib SPs pre-1.3.1.
     -->
-    <bean id="fixup_keyuse" parent="xslt_parent"
+    <bean id="fixup_keyuse" parent="XSLTransformationStage"
         p:id="fixup_keyuse">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/fixup_keyuse.xsl"/>
             </bean>
         </property>
@@ -115,7 +115,7 @@
         Fixup actions which are only required in specific output pipelines need to
         appear there individually.
     -->
-    <bean id="performOtherFixups" parent="composite_parent"
+    <bean id="performOtherFixups" parent="CompositeStage"
         p:id="performOtherFixups">
         <property name="composedStages">
             <list>
@@ -127,10 +127,10 @@
     <!--
         check_fixup_encmethod
     -->
-    <bean id="check_fixup_encmethod" parent="check_xslt_parent"
+    <bean id="check_fixup_encmethod" parent="XSLValidationStage"
         p:id="check_fixup_encmethod">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_encmethod.xsl"/>
             </bean>
         </property>
@@ -139,10 +139,10 @@
     <!--
         check_fixup_keyuse
     -->
-    <bean id="check_fixup_keyuse" parent="check_xslt_parent"
+    <bean id="check_fixup_keyuse" parent="XSLValidationStage"
         p:id="check_fixup_keyuse">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_keyuse.xsl"/>
             </bean>
         </property>
@@ -156,7 +156,7 @@
         export flows, for which we desire the closest possible correspondence to
         the registered metadata.
     -->
-    <bean id="checkPublishable" parent="composite_parent"
+    <bean id="checkPublishable" parent="CompositeStage"
         p:id="checkPublishable">
         <property name="composedStages">
             <list>
@@ -176,7 +176,7 @@
         *******************************************
     -->
     
-    <bean id="uk_ie_edugate_importPipeline" parent="pipeline_parent"
+    <bean id="uk_ie_edugate_importPipeline" parent="SimplePipeline"
         p:id="uk_ie_edugate_importPipeline">
         <property name="stages">
             <list>
@@ -187,7 +187,7 @@
         </property>
     </bean>
     
-    <bean id="uk_se_swamid_importPipeline" parent="pipeline_parent"
+    <bean id="uk_se_swamid_importPipeline" parent="SimplePipeline"
         p:id="uk_se_swamid_importPipeline">
         <property name="stages">
             <list>
@@ -198,7 +198,7 @@
         </property>
     </bean>
     
-    <bean id="uk_us_incommon_importPipeline" parent="pipeline_parent"
+    <bean id="uk_us_incommon_importPipeline" parent="SimplePipeline"
         p:id="uk_us_incommon_importPipeline">
         <property name="stages">
             <list>
@@ -234,7 +234,7 @@
         Assemble a nested EntitiesDescriptor structure with the
         UK federation entities inside an inner element.
     -->
-    <bean id="uk_assembleHierarchicalAggregate" parent="composite_parent"
+    <bean id="uk_assembleHierarchicalAggregate" parent="CompositeStage"
         p:id="uk_assembleHierarchicalAggregate">
         <property name="composedStages">
             <list>
@@ -248,7 +248,7 @@
                         <ref bean="uk_memberEntitySelector"/>
                     </property>
                     <property name="selectedItemPipeline">
-                        <bean name="uk_assemblePipeline" parent="pipeline_parent"
+                        <bean name="uk_assemblePipeline" parent="SimplePipeline"
                             p:id="uk_assemblePipeline">
                             <property name="stages">
                                 <list>
@@ -277,10 +277,10 @@
         ***************************************************
     -->
     
-    <bean id="uk_finaliseProduction" parent="xslt_parent"
+    <bean id="uk_finaliseProduction" parent="XSLTransformationStage"
         p:id="uk_finaliseProduction">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/final_tweak.xsl"/>
             </bean>
         </property>
@@ -291,7 +291,7 @@
         </property>
     </bean>
 
-    <bean id="serializeUnsignedProductionAggregate" parent="serialize_parent"
+    <bean id="serializeUnsignedProductionAggregate" parent="SerializationStage"
         p:id="serializeUnsignedProductionAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -300,7 +300,7 @@
         </property>
     </bean>
 
-    <bean id="uk_productionPipeline" parent="pipeline_parent"
+    <bean id="uk_productionPipeline" parent="SimplePipeline"
         p:id="uk_productionPipeline">
         <property name="stages">
             <list>
@@ -334,7 +334,7 @@
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="serializeUnsignedWayfAggregate" parent="serialize_parent"
+    <bean id="serializeUnsignedWayfAggregate" parent="SerializationStage"
         p:id="serializeUnsignedWayfAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -343,7 +343,7 @@
         </property>
     </bean>
     
-    <bean id="uk_wayfPipeline" parent="pipeline_parent"
+    <bean id="uk_wayfPipeline" parent="SimplePipeline"
         p:id="uk_wayfPipeline">
         <property name="stages">
             <list>
@@ -371,10 +371,10 @@
         ***********************************************
     -->
     
-    <bean id="uk_finaliseFallback" parent="xslt_parent"
+    <bean id="uk_finaliseFallback" parent="XSLTransformationStage"
         p:id="uk_finaliseFallback">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/final_tweak.xsl"/>
             </bean>
         </property>
@@ -385,16 +385,16 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseFallback" parent="xslt_parent"
+    <bean id="uk_normaliseFallback" parent="XSLTransformationStage"
         p:id="uk_normaliseFallback">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_back.xsl"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="serializeUnsignedFallbackAggregate" parent="serialize_parent"
+    <bean id="serializeUnsignedFallbackAggregate" parent="SerializationStage"
         p:id="serializeUnsignedFallbackAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -403,7 +403,7 @@
         </property>
     </bean>
     
-    <bean id="uk_fallbackPipeline" parent="pipeline_parent"
+    <bean id="uk_fallbackPipeline" parent="SimplePipeline"
         p:id="uk_fallbackPipeline">
         <property name="stages">
             <list>
@@ -433,10 +433,10 @@
         ***************************************
     -->
     
-    <bean id="uk_finaliseTest" parent="xslt_parent"
+    <bean id="uk_finaliseTest" parent="XSLTransformationStage"
         p:id="uk_finaliseTest">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/final_tweak.xsl"/>
             </bean>
         </property>
@@ -448,16 +448,16 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseTest" parent="xslt_parent"
+    <bean id="uk_normaliseTest" parent="XSLTransformationStage"
         p:id="uk_normaliseTest">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_test.xsl"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="serializeUnsignedTestAggregate" parent="serialize_parent"
+    <bean id="serializeUnsignedTestAggregate" parent="SerializationStage"
         p:id="serializeUnsignedTestAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -466,7 +466,7 @@
         </property>
     </bean>
     
-    <bean id="uk_testPipeline" parent="composite_parent"
+    <bean id="uk_testPipeline" parent="CompositeStage"
         p:id="uk_testPipeline">
         <property name="composedStages">
             <list>
@@ -495,10 +495,10 @@
         *******************************************
     -->
     
-    <bean id="uk_finaliseExport" parent="xslt_parent"
+    <bean id="uk_finaliseExport" parent="XSLTransformationStage"
         p:id="uk_finaliseExport">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/final_tweak.xsl"/>
             </bean>
         </property>
@@ -510,10 +510,10 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseExport" parent="xslt_parent"
+    <bean id="uk_normaliseExport" parent="XSLTransformationStage"
         p:id="uk_normaliseExport">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_export.xsl"/>
             </bean>
         </property>
@@ -524,7 +524,7 @@
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="serializeUnsignedExportAggregate" parent="serialize_parent"
+    <bean id="serializeUnsignedExportAggregate" parent="SerializationStage"
         p:id="serializeUnsignedExportAggregate">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -533,7 +533,7 @@
         </property>
     </bean>
     
-    <bean id="uk_exportPipeline" parent="pipeline_parent"
+    <bean id="uk_exportPipeline" parent="SimplePipeline"
         p:id="uk_exportPipeline">
         <property name="stages">
             <list>
@@ -563,7 +563,7 @@
         *************************************
     -->
     
-    <bean id="generate" parent="pipeline_parent"
+    <bean id="generate" parent="SimplePipeline"
         p:id="generate">
         <property name="stages">
             <list>
@@ -636,7 +636,7 @@
                     Merge in entities from production metadata exchange sources.
                 -->
                 
-                <bean id="mergeProductionMDXEntities" parent="merge_parent"
+                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage"
                     p:id="mergeProductionMDXortedEntities">
                     <property name="mergedPipelines">
                         <list>
@@ -693,7 +693,7 @@
                     Merge in entities from pre-production metadata exchange sources.
                 -->
 
-                <bean id="mergePreproductionMDXEntities" parent="merge_parent"
+                <bean id="mergePreproductionMDXEntities" parent="PipelineMergeStage"
                     p:id="mergePreproductionMDXEntities">
                     <property name="mergedPipelines">
                         <list>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 606a952e..4d87ab6c 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -35,7 +35,7 @@
         
         Stand-alone statistics generation.
     -->
-    <bean id="statistics" parent="pipeline_parent"
+    <bean id="statistics" parent="SimplePipeline"
         p:id="statistics">
         <property name="stages">
             <list>
@@ -53,21 +53,21 @@
         Generates a page of links to discovery services, for each SP that
         has mdui:uiinfo metadata.
     -->
-    <bean id="sp_mdui_test" parent="pipeline_parent"
+    <bean id="sp_mdui_test" parent="SimplePipeline"
         p:id="sp_mdui_test">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
                 <ref bean="assemble"/>
-                <bean id="process" parent="xslt_parent"
+                <bean id="process" parent="XSLTransformationStage"
                     p:id="process">
                     <property name="xslResource">
-                        <bean parent="file_parent">
+                        <bean parent="FilesystemResource">
                             <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/sp_mdui_test.xsl"/>
                         </bean>
                     </property>
                 </bean>
-                <bean id="serialize" parent="serialize_parent"
+                <bean id="serialize" parent="SerializationStage"
                     p:id="serialize">
                     <property name="outputFile">
                         <bean class="java.io.File">
@@ -87,7 +87,7 @@
         *********************************
     -->
     
-    <bean id="checkPorts" parent="pipeline_parent"
+    <bean id="checkPorts" parent="SimplePipeline"
         p:id="checkPorts">
         <property name="stages">
             <list>
@@ -119,7 +119,7 @@
         ***********************************
     -->
     
-    <bean id="checkFuture" parent="pipeline_parent"
+    <bean id="checkFuture" parent="SimplePipeline"
         p:id="checkFuture">
         <property name="stages">
             <list>
@@ -186,7 +186,7 @@
         
         Serialise the fragment file just imported.
     -->
-    <bean id="serializeImportedMetadata" parent="serialize_parent"
+    <bean id="serializeImportedMetadata" parent="SerializationStage"
         p:id="serializeImportedMetadata">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -202,7 +202,7 @@
         
         For now, just the head of that pipeline.
     -->
-    <bean id="import.metadata" parent="pipeline_parent"
+    <bean id="import.metadata" parent="SimplePipeline"
         p:id="import.metadata">
         <property name="stages">
             <list>
@@ -215,20 +215,20 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <!-- transform into a fragment using our local conventions -->
-                <bean id="importTransform" parent="xslt_parent"
+                <bean id="importTransform" parent="XSLTransformationStage"
                     p:id="importTransform">
                     <property name="xslResource">
-                        <bean parent="file_parent">
+                        <bean parent="FilesystemResource">
                             <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/import.xsl"/>
                         </bean>
                     </property>
                 </bean>
                 
                 <!-- normalise namespaces in a specific way -->
-                <bean id="normalizeFragment" parent="xslt_parent"
+                <bean id="normalizeFragment" parent="XSLTransformationStage"
                     p:id="normalizeFragment">
                     <property name="xslResource">
-                        <bean parent="file_parent">
+                        <bean parent="FilesystemResource">
                             <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_fragment.xsl"/>
                         </bean>
                     </property>
@@ -282,7 +282,7 @@
         #################################################
     -->
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -291,7 +291,7 @@
         </property>
     </bean>
     
-    <bean id="importExported" parent="pipeline_parent"
+    <bean id="importExported" parent="SimplePipeline"
         p:id="importExported">
         <property name="stages">
             <list>
@@ -302,7 +302,7 @@
         </property>
     </bean>
     
-    <bean id="importExportedRaw" parent="pipeline_parent"
+    <bean id="importExportedRaw" parent="SimplePipeline"
         p:id="importExportedRaw">
         <property name="stages">
             <list>
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index d376ff4b..9a07e906 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the export metadata aggregate.
     -->
-    <bean id="uk_eduserv_exportAggregate" parent="domResourceStage_parent"
+    <bean id="uk_eduserv_exportAggregate" parent="DomResourceSourceStage"
         p:id="uk_eduserv_exportAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="uk_eduserv_exportedEntities" parent="composite_parent"
+    <bean id="uk_eduserv_exportedEntities" parent="CompositeStage"
         p:id="uk_eduserv_exportedEntities">
         <property name="composedStages">
             <list>
diff --git a/mdx/uk_eduserv/verbs.xml b/mdx/uk_eduserv/verbs.xml
index f2da55de..00162aba 100644
--- a/mdx/uk_eduserv/verbs.xml
+++ b/mdx/uk_eduserv/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:uk_eduserv/beans.xml"/>
     
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
     
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 6e09628c..c1b63509 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -22,7 +22,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="us_incommon_productionAggregate" parent="domResourceStage_parent"
+    <bean id="us_incommon_productionAggregate" parent="DomResourceSourceStage"
         p:id="us_incommon_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -97,7 +97,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="us_incommon_productionEntities" parent="composite_parent"
+    <bean id="us_incommon_productionEntities" parent="CompositeStage"
         p:id="us_incommon_productionEntities">
         <property name="composedStages">
             <list>
@@ -132,7 +132,7 @@
     <!--
         Synthesise an export collection by filtering the production entities.
     -->
-    <bean id="us_incommon_exportedEntities" parent="composite_parent"
+    <bean id="us_incommon_exportedEntities" parent="CompositeStage"
         p:id="us_incommon_exportedEntities">
         <property name="composedStages">
             <list>
@@ -215,7 +215,7 @@
     <!--
         Fake an export aggregate by aggregating the exported entities.
     -->
-    <bean id="us_incommon_exportedAggregate" parent="composite_parent"
+    <bean id="us_incommon_exportedAggregate" parent="CompositeStage"
         p:id="us_incommon_exportedAggregate">
         <property name="composedStages">
             <list>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index 0dd44f01..83f47542 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -25,7 +25,7 @@
     <!--
         Serialise into this channel's "imported" aggregate file.
     -->
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -34,7 +34,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -45,7 +45,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -55,7 +55,7 @@
         </property>
     </bean>
     
-    <bean id="importExported" parent="pipeline_parent"
+    <bean id="importExported" parent="SimplePipeline"
         p:id="importExported">
         <property name="stages">
             <list>
@@ -66,7 +66,7 @@
         </property>
     </bean>
     
-    <bean id="importExportedRaw" parent="pipeline_parent"
+    <bean id="importExportedRaw" parent="SimplePipeline"
         p:id="importExportedRaw">
         <property name="stages">
             <list>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index adb88d64..8594ffd7 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -35,10 +35,10 @@
     <!--
         check_future_0
     -->
-    <bean id="check_future_0" parent="check_xslt_parent"
+    <bean id="check_future_0" parent="XSLValidationStage"
         p:id="check_future_0">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_0.xsl"/>
             </bean>
         </property>
@@ -47,10 +47,10 @@
     <!--
         check_future_1
     -->
-    <bean id="check_future_1" parent="check_xslt_parent"
+    <bean id="check_future_1" parent="XSLValidationStage"
         p:id="check_future_1">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_1.xsl"/>
             </bean>
         </property>
@@ -59,10 +59,10 @@
     <!--
         check_future_2
     -->
-    <bean id="check_future_2" parent="check_xslt_parent"
+    <bean id="check_future_2" parent="XSLValidationStage"
         p:id="check_future_2">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_2.xsl"/>
             </bean>
         </property>
@@ -71,10 +71,10 @@
     <!--
         check_future_3
     -->
-    <bean id="check_future_3" parent="check_xslt_parent"
+    <bean id="check_future_3" parent="XSLValidationStage"
         p:id="check_future_3">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_3.xsl"/>
             </bean>
         </property>
@@ -83,10 +83,10 @@
     <!--
         check_future_4
     -->
-    <bean id="check_future_4" parent="check_xslt_parent"
+    <bean id="check_future_4" parent="XSLValidationStage"
         p:id="check_future_4">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_4.xsl"/>
             </bean>
         </property>
@@ -95,10 +95,10 @@
     <!--
         check_future_5
     -->
-    <bean id="check_future_5" parent="check_xslt_parent"
+    <bean id="check_future_5" parent="XSLValidationStage"
         p:id="check_future_5">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_5.xsl"/>
             </bean>
         </property>
@@ -107,10 +107,10 @@
     <!--
         check_future_6
     -->
-    <bean id="check_future_6" parent="check_xslt_parent"
+    <bean id="check_future_6" parent="XSLValidationStage"
         p:id="check_future_6">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_6.xsl"/>
             </bean>
         </property>
@@ -119,10 +119,10 @@
     <!--
         check_future_7
     -->
-    <bean id="check_future_7" parent="check_xslt_parent"
+    <bean id="check_future_7" parent="XSLValidationStage"
         p:id="check_future_7">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_7.xsl"/>
             </bean>
         </property>
@@ -131,10 +131,10 @@
     <!--
         check_future_8
     -->
-    <bean id="check_future_8" parent="check_xslt_parent"
+    <bean id="check_future_8" parent="XSLValidationStage"
         p:id="check_future_8">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_8.xsl"/>
             </bean>
         </property>
@@ -143,10 +143,10 @@
     <!--
         check_future_9
     -->
-    <bean id="check_future_9" parent="check_xslt_parent"
+    <bean id="check_future_9" parent="XSLValidationStage"
         p:id="check_future_9">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_9.xsl"/>
             </bean>
         </property>
@@ -157,7 +157,7 @@
         
         Combines all check_future_N stages.
     -->
-    <bean id="check_future" parent="composite_parent"
+    <bean id="check_future" parent="CompositeStage"
         p:id="check_future">
         <property name="composedStages">
             <list>
@@ -188,10 +188,10 @@
     <!--
         check_algsupport
     -->
-    <bean id="check_algsupport" parent="check_xslt_parent"
+    <bean id="check_algsupport" parent="XSLValidationStage"
         p:id="check_algsupport">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_algsupport.xsl"/>
             </bean>
         </property>
@@ -210,10 +210,10 @@
     <!--
         check_adfs
     -->
-    <bean id="check_adfs" parent="check_xslt_parent"
+    <bean id="check_adfs" parent="XSLValidationStage"
         p:id="check_adfs">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_adfs.xsl"/>
             </bean>
         </property>
@@ -222,10 +222,10 @@
     <!--
         check_aggregate
     -->
-    <bean id="check_aggregate" parent="check_xslt_parent"
+    <bean id="check_aggregate" parent="XSLValidationStage"
         p:id="check_aggregate">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
             </bean>
         </property>
@@ -234,10 +234,10 @@
     <!--
         check_bindings
     -->
-    <bean id="check_bindings" parent="check_xslt_parent"
+    <bean id="check_bindings" parent="XSLValidationStage"
         p:id="check_bindings">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_bindings.xsl"/>
             </bean>
         </property>
@@ -246,10 +246,10 @@
     <!--
         check_filtered
     -->
-    <bean id="check_filtered" parent="check_xslt_parent"
+    <bean id="check_filtered" parent="XSLValidationStage"
         p:id="check_filtered">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_filtered.xsl"/>
             </bean>
         </property>
@@ -258,10 +258,10 @@
     <!--
         check_hoksso
     -->
-    <bean id="check_hoksso" parent="check_xslt_parent"
+    <bean id="check_hoksso" parent="XSLValidationStage"
         p:id="check_hoksso">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_hoksso.xsl"/>
             </bean>
         </property>
@@ -270,10 +270,10 @@
     <!--
         check_idpdisc
     -->
-    <bean id="check_idpdisc" parent="check_xslt_parent"
+    <bean id="check_idpdisc" parent="XSLValidationStage"
         p:id="check_idpdisc">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_idpdisc.xsl"/>
             </bean>
         </property>
@@ -282,10 +282,10 @@
     <!--
         check_imported
     -->
-    <bean id="check_imported" parent="check_xslt_parent"
+    <bean id="check_imported" parent="XSLValidationStage"
         p:id="check_imported">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_imported.xsl"/>
             </bean>
         </property>
@@ -294,10 +294,10 @@
     <!--
         check_init
     -->
-    <bean id="check_init" parent="check_xslt_parent"
+    <bean id="check_init" parent="XSLValidationStage"
         p:id="check_init">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_init.xsl"/>
             </bean>
         </property>
@@ -306,10 +306,10 @@
     <!--
         check_mdiop
     -->
-    <bean id="check_mdiop" parent="check_xslt_parent"
+    <bean id="check_mdiop" parent="XSLValidationStage"
         p:id="check_mdiop">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdiop.xsl"/>
             </bean>
         </property>
@@ -328,10 +328,10 @@
         
         Miscellaneous MDRPI tests, in XSLT.
     -->
-    <bean id="check_mdrpi_xslt" parent="check_xslt_parent"
+    <bean id="check_mdrpi_xslt" parent="XSLValidationStage"
         p:id="check_mdrpi_xslt">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdrpi.xsl"/>
             </bean>
         </property>
@@ -342,7 +342,7 @@
         
         Composite check for the MDRPI specification.
     -->
-    <bean id="check_mdrpi" parent="composite_parent"
+    <bean id="check_mdrpi" parent="CompositeStage"
         p:id="check_mdrpi">
         <property name="composedStages">
             <list>
@@ -359,9 +359,9 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="check_regauth_parent" abstract="true" parent="check_xslt_parent">
+    <bean id="check_regauth_parent" abstract="true" parent="XSLValidationStage">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regauth.xsl"/>
             </bean>
         </property>
@@ -402,10 +402,10 @@
         
         Miscellaneous MDUI tests, in XSLT.
     -->
-    <bean id="check_mdui_xslt" parent="check_xslt_parent"
+    <bean id="check_mdui_xslt" parent="XSLValidationStage"
         p:id="check_mdui_xslt">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdui.xsl"/>
             </bean>
         </property>
@@ -416,7 +416,7 @@
         
         Composite check for the MDUI specification.
     -->
-    <bean id="check_mdui" parent="composite_parent"
+    <bean id="check_mdui" parent="CompositeStage"
         p:id="check_mdui">
         <property name="composedStages">
             <list>
@@ -437,10 +437,10 @@
     <!--
         check_misc
     -->
-    <bean id="check_misc" parent="check_xslt_parent"
+    <bean id="check_misc" parent="XSLValidationStage"
         p:id="check_misc">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_misc.xsl"/>
             </bean>
         </property>
@@ -449,10 +449,10 @@
     <!--
         check_namespaces
     -->
-    <bean id="check_namespaces" parent="check_xslt_parent"
+    <bean id="check_namespaces" parent="XSLValidationStage"
         p:id="check_namespaces">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_namespaces.xsl"/>
             </bean>
         </property>
@@ -461,10 +461,10 @@
     <!--
         check_nokeyname
     -->
-    <bean id="check_nokeyname" parent="check_xslt_parent"
+    <bean id="check_nokeyname" parent="XSLValidationStage"
         p:id="check_nokeyname">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_nokeyname.xsl"/>
             </bean>
         </property>
@@ -475,10 +475,10 @@
         
         Check for regular expressions in Shibboleth Scope elements.  Applied very selectively.
     -->
-    <bean id="check_regscope" parent="check_xslt_parent"
+    <bean id="check_regscope" parent="XSLValidationStage"
         p:id="check_regscope">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regscope.xsl"/>
             </bean>
         </property>
@@ -487,10 +487,10 @@
     <!--
         check_reqattr
     -->
-    <bean id="check_reqattr" parent="check_xslt_parent"
+    <bean id="check_reqattr" parent="XSLValidationStage"
         p:id="check_reqattr">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_reqattr.xsl"/>
             </bean>
         </property>
@@ -499,10 +499,10 @@
     <!--
         check_saml2int
     -->
-    <bean id="check_saml2int" parent="check_xslt_parent"
+    <bean id="check_saml2int" parent="XSLValidationStage"
         p:id="check_saml2int">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2int.xsl"/>
             </bean>
         </property>
@@ -511,10 +511,10 @@
     <!--
         check_saml1
     -->
-    <bean id="check_saml1" parent="check_xslt_parent"
+    <bean id="check_saml1" parent="XSLValidationStage"
         p:id="check_saml1">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml1.xsl"/>
             </bean>
         </property>
@@ -523,10 +523,10 @@
     <!--
         check_saml2
     -->
-    <bean id="check_saml2" parent="check_xslt_parent"
+    <bean id="check_saml2" parent="XSLValidationStage"
         p:id="check_saml2">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2.xsl"/>
             </bean>
         </property>
@@ -535,10 +535,10 @@
     <!--
         check_saml2meta
     -->
-    <bean id="check_saml2meta" parent="check_xslt_parent"
+    <bean id="check_saml2meta" parent="XSLValidationStage"
         p:id="check_saml2meta">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2meta.xsl"/>
             </bean>
         </property>
@@ -547,10 +547,10 @@
     <!--
         check_shibboleth
     -->
-    <bean id="check_shibboleth" parent="check_xslt_parent"
+    <bean id="check_shibboleth" parent="XSLValidationStage"
         p:id="check_shibboleth">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_shibboleth.xsl"/>
             </bean>
         </property>
@@ -579,10 +579,10 @@
     <!--
         check_vhosts
     -->
-    <bean id="check_vhosts" parent="check_xslt_parent"
+    <bean id="check_vhosts" parent="XSLValidationStage"
         p:id="check_vhosts">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_vhosts.xsl"/>
             </bean>
         </property>
@@ -599,7 +599,7 @@
     <!--
         check_incmd
     -->
-    <bean id="check_incmd" parent="check_xslt_parent"
+    <bean id="check_incmd" parent="XSLValidationStage"
         p:id="check_incmd">
         <property name="xslResource">
             <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_incmd.xsl"/>
@@ -617,10 +617,10 @@
     <!--
         check_uk_trust
     -->
-    <bean id="check_uk_trust" parent="check_xslt_parent"
+    <bean id="check_uk_trust" parent="XSLValidationStage"
         p:id="check_uk_trust">
         <property name="xslResource">
-            <bean parent="file_parent">
+            <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_uk_trust.xsl"/>
             </bean>
         </property>
@@ -637,7 +637,7 @@
     <!--
         CHECK_std
     -->
-    <bean id="CHECK_std" parent="composite_parent"
+    <bean id="CHECK_std" parent="CompositeStage"
         p:id="CHECK_std">
         <property name="composedStages">
             <list>
@@ -667,7 +667,7 @@
     <!--
         CHECK_imported
     -->
-    <bean id="CHECK_imported" parent="composite_parent"
+    <bean id="CHECK_imported" parent="CompositeStage"
         p:id="CHECK_imported">
         <property name="composedStages">
             <list>