diff --git a/build.xml b/build.xml
index b32b9fb7..6b5a5000 100644
--- a/build.xml
+++ b/build.xml
@@ -1125,14 +1125,14 @@
     	<CHANNEL.do channel="edugain" verb="testImport"/>
     </target>
     
+    <target name="flow.se_swamid.import">
+        <CHANNEL.import channel="se_swamid"/>
+    </target>
+    
     <target name="flow.si_arnes.import">
         <CHANNEL.import channel="si_arnes"/>
     </target>
     
-	<target name="flow.swamid.import">
-        <CHANNEL.import channel="swamid"/>
-	</target>
-    
     <target name="flow.switch.import">
         <CHANNEL.import channel="switch"/>
     </target>
diff --git a/mdx/swamid/beans.xml b/mdx/se_swamid/beans.xml
similarity index 95%
rename from mdx/swamid/beans.xml
rename to mdx/se_swamid/beans.xml
index d54638b3..d3a15621 100644
--- a/mdx/swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Common beans for SWAMID operations.
+    Common beans for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
@@ -21,7 +21,7 @@
     <bean id="swamidSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/swamid/md-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/se_swamid/md-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/swamid/import.xml b/mdx/se_swamid/import.xml
similarity index 74%
rename from mdx/swamid/import.xml
rename to mdx/se_swamid/import.xml
index 77e74853..aae37729 100644
--- a/mdx/swamid/import.xml
+++ b/mdx/se_swamid/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from SWAMID.
+    Import pipeline for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
@@ -11,24 +11,24 @@
     <import resource="../common-beans.xml"/>
         
     <!--
-        Import SWAMID-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="swamid_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="se_swamid_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="swamid_serializeImported"/>
+        <property name="id" value="se_swamid_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/swamid/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/se_swamid/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="swamid_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="se_swamid_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="swamid_import"/>
+        <property name="id" value="se_swamid_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchSwamidExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="swamid_serializeImported"/>
+                <ref bean="se_swamid_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/swamid/md-signer.crt b/mdx/se_swamid/md-signer.crt
similarity index 100%
rename from mdx/swamid/md-signer.crt
rename to mdx/se_swamid/md-signer.crt