diff --git a/build.xml b/build.xml
index 73142356..056da2a5 100644
--- a/build.xml
+++ b/build.xml
@@ -1050,14 +1050,19 @@
 	<!--
 	    Aggregator based work is divided into channels, each of
 	    which lives in a directory under /mdx/.  Channels are
-	    mostly named country-source, but there are exceptions
+	    mostly named country_source, but there are exceptions
 	    to this rule.  Some of the exceptions may be rationalised
 	    in the future.
 	    
 	    Each channel can have a number of verbs which can be
 	    executed.  The convention is that the verb names a
 	    configuration file, and that the pipeline to execute
-	    is named as channel.pipeline.
+	    is named as channel_pipeline.
+	    
+	    Note that these conventions, which derive from identifier
+	    names in the Spring Expression Language, in combination
+	    mean that pipelines may be named in the form
+	    country_source_pipeline.
 	-->
 	
 	<!--
@@ -1071,7 +1076,7 @@
         <sequential>
             <echo>Running @{channel} @{verb} flow.</echo>
             <MDA config="${mdx.dir}/@{channel}/@{verb}.xml"
-                pipeline="@{channel}.@{verb}"/>
+                pipeline="@{channel}_@{verb}"/>
             <echo>Completed @{channel} @{verb} flow.</echo>
         </sequential>
     </macrodef>
@@ -1108,12 +1113,12 @@
         <CHANNEL.import channel="caf"/>
     </target>
     
-	<target name="flow.cz-eduid.import">
-		<CHANNEL.import channel="cz-eduid"/>
+	<target name="flow.cz_eduid.import">
+		<CHANNEL.import channel="cz_eduid"/>
 	</target>
 
-	<target name="flow.ie-edugate.import">
-        <CHANNEL.import channel="ie-edugate"/>
+	<target name="flow.ie_edugate.import">
+        <CHANNEL.import channel="ie_edugate"/>
     </target>
     
     <target name="flow.incommon.import">
@@ -1125,7 +1130,7 @@
     </target>
     
     <target name="flow.edugain.test.import">
-    	<CHANNEL.do channel="edugain" verb="test-import"/>
+    	<CHANNEL.do channel="edugain" verb="testImport"/>
     </target>
     
 	<target name="flow.swamid.import">
@@ -1136,8 +1141,8 @@
         <CHANNEL.import channel="switch"/>
     </target>
     
-    <target name="flow.uk-eduserv.import">
-        <CHANNEL.import channel="uk-eduserv"/>
+    <target name="flow.uk_eduserv.import">
+        <CHANNEL.import channel="uk_eduserv"/>
     </target>
     
 	<!--
diff --git a/mdx/aaf/import.xml b/mdx/aaf/import.xml
index e97e536c..8df75bb5 100644
--- a/mdx/aaf/import.xml
+++ b/mdx/aaf/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="aaf.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="aaf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="aaf.serializeImported"/>
+        <property name="id" value="aaf_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
     
-    <bean id="aaf.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="aaf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="aaf_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchAafExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="aaf.serializeImported"/>
+                <ref bean="aaf_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/arnes/import.xml b/mdx/arnes/import.xml
index 8134f25e..e5eb4a77 100644
--- a/mdx/arnes/import.xml
+++ b/mdx/arnes/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="arnes.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="arnes_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="arnes.serializeImported"/>
+        <property name="id" value="arnes_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
     
-    <bean id="arnes.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="arnes_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="arnes_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchArnesExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="arnes.serializeImported"/>
+                <ref bean="arnes_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/caf/import.xml b/mdx/caf/import.xml
index f714982f..b1a54c36 100644
--- a/mdx/caf/import.xml
+++ b/mdx/caf/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="caf.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="caf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="caf.serializeImported"/>
+        <property name="id" value="caf_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
     
-    <bean id="caf.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="caf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="caf_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchCafExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="caf.serializeImported"/>
+                <ref bean="caf_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index fdc938a8..c10caa31 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -184,7 +184,7 @@
                 <ref bean="populateItemIds"/>
                 <ref bean="cleanImport"/>
                 <ref bean="checkSchemas"/>
-                <ref bean="CHECK.imported"/>
+                <ref bean="CHECK_imported"/>
                 <ref bean="errorAnnouncingFilter"/>
             </list>
         </property>
diff --git a/mdx/cz-eduid/beans.xml b/mdx/cz_eduid/beans.xml
similarity index 76%
rename from mdx/cz-eduid/beans.xml
rename to mdx/cz_eduid/beans.xml
index e90f366c..45dbce57 100644
--- a/mdx/cz-eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -20,9 +20,9 @@
         
         For the moment, use the production aggregate in lieu of a designated export aggregate.
     -->
-    <bean id="cz-eduid.fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="cz_eduid_fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.fetchExportAggregate"/>
+        <property name="id" value="cz_eduid_fetchExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://metadata.eduid.cz/entities/eduid"/>        
     </bean>
@@ -30,11 +30,11 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="cz-eduid.signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+    <bean id="cz_eduid_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
         lazy-init="true">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz-eduid/metadata.eduid.cz.crt.pem"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz_eduid/metadata.eduid.cz.crt.pem"/>
             </bean>
         </property>
     </bean>
@@ -42,22 +42,22 @@
     <!--
         Check the signature on a document.
     -->
-    <bean id="cz-eduid.checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+    <bean id="cz_eduid_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.checkSignature"/>
-        <property name="verificationCertificate" ref="cz-eduid.signingCertificate"/>
+        <property name="id" value="cz_eduid_checkSignature"/>
+        <property name="verificationCertificate" ref="cz_eduid_signingCertificate"/>
     </bean>
     
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="cz-eduid.exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="cz_eduid_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.exportedEntities"/>
+        <property name="id" value="cz_eduid_exportedEntities"/>
         <property name="composedStages">
             <list>
-                <ref bean="cz-eduid.fetchExportAggregate"/>
-                <ref bean="cz-eduid.checkSignature"/>
+                <ref bean="cz_eduid_fetchExportAggregate"/>
+                <ref bean="cz_eduid_checkSignature"/>
                 
                 <!-- failure to validate signature is fatal -->
                 <ref bean="errorTerminatingFilter"/>
diff --git a/mdx/cz-eduid/import.xml b/mdx/cz_eduid/import.xml
similarity index 74%
rename from mdx/cz-eduid/import.xml
rename to mdx/cz_eduid/import.xml
index 8809e4bd..6b94d699 100644
--- a/mdx/cz-eduid/import.xml
+++ b/mdx/cz_eduid/import.xml
@@ -15,25 +15,25 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="cz-eduid.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="cz_eduid_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.serializeImported"/>
+        <property name="id" value="cz_eduid_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz-eduid/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz_eduid/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="cz-eduid.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="cz_eduid_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="cz_eduid_import"/>
         <property name="stages">
             <list>                
-                <ref bean="cz-eduid.exportedEntities"/>
+                <ref bean="cz_eduid_exportedEntities"/>
                 <ref bean="standardImportTail"/>
-                <ref bean="cz-eduid.serializeImported"/>
+                <ref bean="cz_eduid_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/cz-eduid/metadata.eduid.cz.crt.pem b/mdx/cz_eduid/metadata.eduid.cz.crt.pem
similarity index 100%
rename from mdx/cz-eduid/metadata.eduid.cz.crt.pem
rename to mdx/cz_eduid/metadata.eduid.cz.crt.pem
diff --git a/mdx/edugain/import.xml b/mdx/edugain/import.xml
index 0d6fbad0..ddeac7dc 100644
--- a/mdx/edugain/import.xml
+++ b/mdx/edugain/import.xml
@@ -19,9 +19,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="edugain.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="edugain_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain.serializeImported"/>
+        <property name="id" value="edugain_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -30,9 +30,9 @@
         </property>
     </bean>
     
-    <bean id="edugain.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="edugain_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="edugain_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchEduGainAggregate"/>
@@ -47,7 +47,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="edugain.serializeImported"/>
+                <ref bean="edugain_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/edugain/test-import.xml b/mdx/edugain/testImport.xml
similarity index 81%
rename from mdx/edugain/test-import.xml
rename to mdx/edugain/testImport.xml
index 08ce8f54..324d343c 100644
--- a/mdx/edugain/test-import.xml
+++ b/mdx/edugain/testImport.xml
@@ -19,20 +19,20 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="edugain.serializeTestImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="edugain_serializeTestImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain.serializeTestImported"/>
+        <property name="id" value="edugain_serializeTestImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/test-imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/testImported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="edugain.test-import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="edugain_testImport" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="edugain_testImport"/>
         <property name="stages">
             <list>
                 <ref bean="fetchEduGainTestAggregate"/>
@@ -47,7 +47,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="edugain.serializeTestImported"/>
+                <ref bean="edugain_serializeTestImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/ie-edugate/beans.xml b/mdx/ie_edugate/beans.xml
similarity index 72%
rename from mdx/ie-edugate/beans.xml
rename to mdx/ie_edugate/beans.xml
index aaa7a31c..97a83d3d 100644
--- a/mdx/ie-edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -10,9 +10,9 @@
         
         For the moment, use the production aggregate in lieu of a designated export aggregate.
     -->
-    <bean id="ie-edugate.fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="ie_edugate_fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.fetchExportAggregate"/>
+        <property name="id" value="ie_edugate_fetchExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
     </bean>
@@ -20,10 +20,10 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="ie-edugate.signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <bean id="ie_edugate_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie-edugate/metadata-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie_edugate/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -31,22 +31,22 @@
     <!--
         Check the signature on a document.
     -->
-    <bean id="ie-edugate.checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+    <bean id="ie_edugate_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.checkSignature"/>
-        <property name="verificationCertificate" ref="ie-edugate.signingCertificate"/>
+        <property name="id" value="ie_edugate_checkSignature"/>
+        <property name="verificationCertificate" ref="ie_edugate_signingCertificate"/>
     </bean>
     
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="ie-edugate.exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="ie_edugate_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.exportedEntities"/>
+        <property name="id" value="ie_edugate_exportedEntities"/>
         <property name="composedStages">
             <list>
-                <ref bean="ie-edugate.fetchExportAggregate"/>
-                <ref bean="ie-edugate.checkSignature"/>
+                <ref bean="ie_edugate_fetchExportAggregate"/>
+                <ref bean="ie_edugate_checkSignature"/>
                 
                 <!-- failure to validate signature is fatal -->
                 <ref bean="errorTerminatingFilter"/>
diff --git a/mdx/uk-eduserv/import.xml b/mdx/ie_edugate/import.xml
similarity index 73%
rename from mdx/uk-eduserv/import.xml
rename to mdx/ie_edugate/import.xml
index 195cc1f7..c3c03aab 100644
--- a/mdx/uk-eduserv/import.xml
+++ b/mdx/ie_edugate/import.xml
@@ -15,25 +15,25 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="uk-eduserv.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="ie_edugate_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk-eduserv.serializeImported"/>
+        <property name="id" value="ie_edugate_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk-eduserv/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie_edugate/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="uk-eduserv.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="ie_edugate_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="ie_edugate_import"/>
         <property name="stages">
             <list>
-                <ref bean="uk-eduserv.exportedEntities"/>
+                <ref bean="ie_edugate_exportedEntities"/>
                 <ref bean="standardImportTail"/>
-                <ref bean="uk-eduserv.serializeImported"/>
+                <ref bean="ie_edugate_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/ie-edugate/metadata-signer.crt b/mdx/ie_edugate/metadata-signer.crt
similarity index 100%
rename from mdx/ie-edugate/metadata-signer.crt
rename to mdx/ie_edugate/metadata-signer.crt
diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index 094e2882..ea328bde 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="incommon.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="incommon_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="incommon.serializeImported"/>
+        <property name="id" value="incommon_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
     
-    <bean id="incommon.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="incommon_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="incommon_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchInCommonExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="incommon.serializeImported"/>
+                <ref bean="incommon_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/swamid/import.xml b/mdx/swamid/import.xml
index 309c71c6..77e74853 100644
--- a/mdx/swamid/import.xml
+++ b/mdx/swamid/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="swamid.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="swamid_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="swamid.serializeImported"/>
+        <property name="id" value="swamid_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
     
-    <bean id="swamid.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="swamid_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="swamid_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchSwamidExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="swamid.serializeImported"/>
+                <ref bean="swamid_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/switch/import.xml b/mdx/switch/import.xml
index 83a38873..7551d808 100644
--- a/mdx/switch/import.xml
+++ b/mdx/switch/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="switch.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="switch_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="switch.serializeImported"/>
+        <property name="id" value="switch_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
     
-    <bean id="switch.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="switch_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="switch_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchSwitchExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="switch.serializeImported"/>
+                <ref bean="switch_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 452185e8..4d9cf6b2 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -10,16 +10,16 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
     <!--
-        uk.fetchFragmentFiles
+        uk_fetchFragmentFiles
         
         Collects all the UK metadata "fragment files" from the /entities directory.
         
         Each fragment file contains a single EntityDescriptor.  The name of each
         eligible file matches a particular regular expression.
     -->
-    <bean id="uk.fetchFragmentFiles" class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
+    <bean id="uk_fetchFragmentFiles" class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.fetchFragmentFiles"/>
+        <property name="id" value="uk_fetchFragmentFiles"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
@@ -35,22 +35,22 @@
     
     
     <!--
-        uk.filterDeletedEntities
+        uk_filterDeletedEntities
         
         Remove entity items which have the ukfedlabel:DeletedEntity label on them.
         This convention will be replaced at some point by the files not being available
         for collection in the first place.
     -->
-    <bean id="uk.filterDeletedEntities" class="net.shibboleth.metadata.dom.XPathFilteringStage"
+    <bean id="uk_filterDeletedEntities" class="net.shibboleth.metadata.dom.XPathFilteringStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="filterDeletedEntities"/>
+        <property name="id" value="uk_filterDeletedEntities"/>
         <constructor-arg name="expression" value="//ukfedlabel:DeletedEntity"/>
         <constructor-arg name="prefixMappings" ref="commonNamespaces"/>
     </bean>
     
     
     <!--
-        uk.processScopes
+        uk_processScopes
         
         This stage normalises scope handling in two ways particular to the UK
         federation:
@@ -63,9 +63,9 @@
         This transform can be run on individual EntityDescriptors or on an
         aggregate EntitiesDescriptor.
     -->
-    <bean id="uk.processScopes" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+    <bean id="uk_processScopes" class="net.shibboleth.metadata.dom.XSLTransformationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="processScopes"/>
+        <property name="id" value="uk_processScopes"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/scopes.xsl"/>
@@ -73,39 +73,39 @@
         </property>
         <property name="transformParameters">
             <map>
-                <entry key="members" value-ref="uk.members"/>
+                <entry key="members" value-ref="uk_members"/>
             </map>
         </property>
     </bean>
     
     
     <!--
-        uk.membersResource
+        uk_membersResource
         
         A Resource referencing the members.xml document.
     -->
-    <bean id="uk.membersResource" class="org.opensaml.util.resource.FilesystemResource" lazy-init="true">
+    <bean id="uk_membersResource" class="org.opensaml.util.resource.FilesystemResource" lazy-init="true">
         <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
     </bean>
     
     
     <!--
-        uk.membersDocument
+        uk_membersDocument
         
         This bean contains the contents of the members.xml file as a DOM Document.
     -->
-    <bean id="uk.membersDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean" lazy-init="true">
-        <property name="documentResource" ref="uk.membersResource"/>
+    <bean id="uk_membersDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean" lazy-init="true">
+        <property name="documentResource" ref="uk_membersResource"/>
         <property name="parserPool" ref="parserPool"/>
     </bean>
     
     
     <!--
-        uk.members
+        uk_members
         
         This bean implements an API for access to the contents of the members.xml document.
     -->
-    <bean id="uk.members" class="uk.org.ukfederation.members.Members" lazy-init="true">
+    <bean id="uk_members" class="uk.org.ukfederation.members.Members" lazy-init="true">
         <constructor-arg>
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
@@ -129,18 +129,18 @@
         </property>
         <property name="transformParameters">
             <map>
-                <entry key="members" value-ref="uk.members"/>
+                <entry key="members" value-ref="uk_members"/>
             </map>
         </property>
     </bean>
     
     
     <!--
-        uk.trustRootsDocument
+        uk_trustRootsDocument
         
         This bean contains the contents of the master.xml file as a DOM Document.
     -->
-    <bean id="uk.trustRootsDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean"
+    <bean id="uk_trustRootsDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean"
         lazy-init="true">
         <property name="parserPool" ref="parserPool"/>
         <property name="documentResource">
@@ -152,13 +152,13 @@
     
     
     <!--
-        uk.addTrustRoots
+        uk_addTrustRoots
         
         This stage adds the UK federation trust roots to an EntitiesDescriptor.
     -->
-    <bean id="uk.addTrustRoots" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+    <bean id="uk_addTrustRoots" class="net.shibboleth.metadata.dom.XSLTransformationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.addUKTrustRoots"/>
+        <property name="id" value="uk_addTrustRoots"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/trust-roots.xsl"/>
@@ -166,20 +166,20 @@
         </property>
         <property name="transformParameters">
             <map>
-                <entry key="trustRootsDocument" value-ref="uk.trustRootsDocument"/>
+                <entry key="trustRootsDocument" value-ref="uk_trustRootsDocument"/>
             </map>
         </property>
     </bean>
     
 
     <!--
-        uk.processFragment
+        uk_processFragment
         
         This stage performs any standard cleanup required for UK federation fragment files.
     -->
-    <bean id="uk.processFragment" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+    <bean id="uk_processFragment" class="net.shibboleth.metadata.dom.XSLTransformationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.processFragment"/>
+        <property name="id" value="uk_processFragment"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/fragment.xsl"/>
@@ -191,18 +191,18 @@
     <!--
         Populate UKId values from entities.
     -->
-    <bean id="uk.populateIds" class="uk.org.ukfederation.mda.EntityDescriptorUKIdPopulationStage"
+    <bean id="uk_populateIds" class="uk.org.ukfederation.mda.EntityDescriptorUKIdPopulationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.populateIds"/>
+        <property name="id" value="uk_populateIds"/>
     </bean>
     
 
     <!--
         UK federation EntitiesDescriptor assembler pipeline stage.
     -->
-    <bean id="uk.assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"
+    <bean id="uk_assemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.assemble"/>
+        <property name="id" value="uk_assemble"/>
         <property name="descriptorName" value="http://ukfederation.org.uk"/>
         <property name="itemOrderingStrategy">
             <bean class="uk.org.ukfederation.mda.UKEntityOrderingStrategy"/>
@@ -213,19 +213,19 @@
     <!--
         Fetch and process the registered entities as a collection.
     -->
-    <bean id="uk.registeredEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="uk_registeredEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.registeredEntities"/>
+        <property name="id" value="uk_registeredEntities"/>
         <property name="composedStages">
             <list>
-                <ref bean="uk.fetchFragmentFiles"/>
-                <ref bean="uk.filterDeletedEntities"/>
-                <ref bean="uk.processFragment"/>
-                <ref bean="uk.processScopes"/>
+                <ref bean="uk_fetchFragmentFiles"/>
+                <ref bean="uk_filterDeletedEntities"/>
+                <ref bean="uk_processFragment"/>
+                <ref bean="uk_processScopes"/>
                 <ref bean="populateItemIds"/>
-                <ref bean="uk.populateIds"/>
+                <ref bean="uk_populateIds"/>
                 <ref bean="checkSchemas"/>
-                <ref bean="CHECK.std"/>
+                <ref bean="CHECK_std"/>
                 <ref bean="check_ukreg"/>
                 
                 <!-- failure of any check on registered metadata is fatal -->
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index e4a659a3..f0b409f9 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -19,9 +19,9 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="uk.serializeCollected" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="uk_serializeCollected" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk.serializeCollected"/>
+        <property name="id" value="uk_serializeCollected"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -30,16 +30,16 @@
         </property>
     </bean>
 
-    <bean id="uk.collect" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="uk_collect" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="uk_collect"/>
         <property name="stages">
             <list>
-                <ref bean="uk.registeredEntities"/>
-                <ref bean="uk.assemble"/>
-                <ref bean="uk.addTrustRoots"/>
+                <ref bean="uk_registeredEntities"/>
+                <ref bean="uk_assemble"/>
+                <ref bean="uk_addTrustRoots"/>
                 <ref bean="normaliseNamespaces"/>
-                <ref bean="uk.serializeCollected"/>
+                <ref bean="uk_serializeCollected"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/uk-eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
similarity index 70%
rename from mdx/uk-eduserv/beans.xml
rename to mdx/uk_eduserv/beans.xml
index fd9afb9c..aed703aa 100644
--- a/mdx/uk-eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -8,9 +8,9 @@
     <!--
         Fetch the export metadata aggregate.
     -->
-    <bean id="uk-eduserv.fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="uk_eduserv_fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk-eduserv.fetchExportAggregate"/>
+        <property name="id" value="uk_eduserv_fetchExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://auth.athensams.net/saml/metadata?name=ukfederation"/>
     </bean>
@@ -18,10 +18,10 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="uk-eduserv.signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <bean id="uk_eduserv_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk-eduserv/metadata-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk_eduserv/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -29,22 +29,22 @@
     <!--
         Check the signature on a document.
     -->
-    <bean id="uk-eduserv.checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+    <bean id="uk_eduserv_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk-eduserv.checkSignature"/>
-        <property name="verificationCertificate" ref="uk-eduserv.signingCertificate"/>
+        <property name="id" value="uk_eduserv_checkSignature"/>
+        <property name="verificationCertificate" ref="uk_eduserv_signingCertificate"/>
     </bean>
     
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="uk-eduserv.exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="uk_eduserv_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk-eduserv.exportedEntities"/>
+        <property name="id" value="uk_eduserv_exportedEntities"/>
         <property name="composedStages">
             <list>
-                <ref bean="uk-eduserv.fetchExportAggregate"/>
-                <ref bean="uk-eduserv.checkSignature"/>
+                <ref bean="uk_eduserv_fetchExportAggregate"/>
+                <ref bean="uk_eduserv_checkSignature"/>
                 
                 <!-- failure to validate signature is fatal -->
                 <ref bean="errorTerminatingFilter"/>
diff --git a/mdx/ie-edugate/import.xml b/mdx/uk_eduserv/import.xml
similarity index 77%
rename from mdx/ie-edugate/import.xml
rename to mdx/uk_eduserv/import.xml
index 04d97841..0df96a59 100644
--- a/mdx/ie-edugate/import.xml
+++ b/mdx/uk_eduserv/import.xml
@@ -15,25 +15,25 @@
     -->
     <import resource="beans.xml"/>
     
-    <bean id="ie-edugate.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="uk_eduserv_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.serializeImported"/>
+        <property name="id" value="uk_eduserv_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie-edugate/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk_eduserv/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="ie-edugate.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="uk_eduserv_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
         <property name="id" value="pipeline"/>
         <property name="stages">
             <list>
-                <ref bean="ie-edugate.exportedEntities"/>
+                <ref bean="uk_eduserv_exportedEntities"/>
                 <ref bean="standardImportTail"/>
-                <ref bean="ie-edugate.serializeImported"/>
+                <ref bean="uk_eduserv_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/uk-eduserv/metadata-signer.crt b/mdx/uk_eduserv/metadata-signer.crt
similarity index 100%
rename from mdx/uk-eduserv/metadata-signer.crt
rename to mdx/uk_eduserv/metadata-signer.crt
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index b5066da2..f20f5b27 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -192,11 +192,11 @@
     </bean>
     
     <!--
-        CHECK.std
+        CHECK_std
     -->
-    <bean id="CHECK.std" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="CHECK_std" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="CHECK.std"/>
+        <property name="id" value="CHECK_std"/>
         <property name="composedStages">
             <list>
                 <ref bean="check_adfs"/>
@@ -212,14 +212,14 @@
     </bean>
     
     <!--
-        CHECK.imported
+        CHECK_imported
     -->
-    <bean id="CHECK.imported" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="CHECK_imported" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="CHECK.imported"/>
+        <property name="id" value="CHECK_imported"/>
         <property name="composedStages">
             <list>
-                <ref bean="CHECK.std"/>
+                <ref bean="CHECK_std"/>
                 <ref bean="check_future"/>
                 <ref bean="check_saml2int"/>
             </list>