diff --git a/build.xml b/build.xml
index 6ad09cc3..3bf03777 100644
--- a/build.xml
+++ b/build.xml
@@ -1121,12 +1121,12 @@
         <CHANNEL.import channel="ie_edugate"/>
     </target>
     
-    <target name="flow.edugain.import">
-        <CHANNEL.import channel="edugain"/>
+    <target name="flow.int_edugain.import">
+        <CHANNEL.import channel="int_edugain"/>
     </target>
     
-    <target name="flow.edugain.test.import">
-    	<CHANNEL.do channel="edugain" verb="testImport"/>
+    <target name="flow.int_edugain.testImport">
+        <CHANNEL.do channel="int_edugain" verb="testImport"/>
     </target>
     
     <target name="flow.se_swamid.import">
diff --git a/mdx/edugain/beans.xml b/mdx/int_edugain/beans.xml
similarity index 95%
rename from mdx/edugain/beans.xml
rename to mdx/int_edugain/beans.xml
index e9d6086e..2af1dfa0 100644
--- a/mdx/edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Common beans for eduGAIN operations.
+    Common beans for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util"
@@ -37,7 +37,7 @@
     <bean id="edugainSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/edugain-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/edugain-signer.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/edugain/edugain-signer.crt b/mdx/int_edugain/edugain-signer.crt
similarity index 100%
rename from mdx/edugain/edugain-signer.crt
rename to mdx/int_edugain/edugain-signer.crt
diff --git a/mdx/edugain/import.xml b/mdx/int_edugain/import.xml
similarity index 75%
rename from mdx/edugain/import.xml
rename to mdx/int_edugain/import.xml
index ddeac7dc..c56e6bdd 100644
--- a/mdx/edugain/import.xml
+++ b/mdx/int_edugain/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from eduGAIN.
+    Import pipeline for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util"
@@ -15,24 +15,24 @@
     <import resource="../common-beans.xml"/>
     
     <!--
-        Import eduGAIN-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="edugain_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="int_edugain_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain_serializeImported"/>
+        <property name="id" value="int_edugain_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="edugain_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="int_edugain_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain_import"/>
+        <property name="id" value="int_edugain_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchEduGainAggregate"/>
@@ -47,7 +47,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="edugain_serializeImported"/>
+                <ref bean="int_edugain_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/edugain/testImport.xml b/mdx/int_edugain/testImport.xml
similarity index 74%
rename from mdx/edugain/testImport.xml
rename to mdx/int_edugain/testImport.xml
index 324d343c..e7257295 100644
--- a/mdx/edugain/testImport.xml
+++ b/mdx/int_edugain/testImport.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for test metadata from eduGAIN.
+    Import pipeline for test metadata for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:util="http://www.springframework.org/schema/util"
@@ -15,24 +15,24 @@
     <import resource="../common-beans.xml"/>
     
     <!--
-        Import eduGAIN-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="edugain_serializeTestImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="int_edugain_serializeTestImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain_serializeTestImported"/>
+        <property name="id" value="int_edugain_serializeTestImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/testImported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/testImported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="edugain_testImport" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="int_edugain_testImport" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain_testImport"/>
+        <property name="id" value="int_edugain_testImport"/>
         <property name="stages">
             <list>
                 <ref bean="fetchEduGainTestAggregate"/>
@@ -47,7 +47,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="edugain_serializeTestImported"/>
+                <ref bean="int_edugain_serializeTestImported"/>
             </list>
         </property>
     </bean>