diff --git a/build.xml b/build.xml
index 6b5a5000..6ad09cc3 100644
--- a/build.xml
+++ b/build.xml
@@ -1109,6 +1109,10 @@
         <CHANNEL.import channel="ca_caf"/>
     </target>
     
+    <target name="flow.ch_switchaai.import">
+        <CHANNEL.import channel="ch_switchaai"/>
+    </target>
+    
 	<target name="flow.cz_eduid.import">
 		<CHANNEL.import channel="cz_eduid"/>
 	</target>
@@ -1133,10 +1137,6 @@
         <CHANNEL.import channel="si_arnes"/>
     </target>
     
-    <target name="flow.switch.import">
-        <CHANNEL.import channel="switch"/>
-    </target>
-    
     <target name="flow.uk_eduserv.import">
         <CHANNEL.import channel="uk_eduserv"/>
     </target>
diff --git a/mdx/switch/beans.xml b/mdx/ch_switchaai/beans.xml
similarity index 94%
rename from mdx/switch/beans.xml
rename to mdx/ch_switchaai/beans.xml
index b8f2f996..c5724e23 100644
--- a/mdx/switch/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Common beans for SWITCH 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="switchSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/switch/metadata.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/metadata.crt"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/switch/import.xml b/mdx/ch_switchaai/import.xml
similarity index 73%
rename from mdx/switch/import.xml
rename to mdx/ch_switchaai/import.xml
index 7551d808..68c28bb3 100644
--- a/mdx/switch/import.xml
+++ b/mdx/ch_switchaai/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from SWITCH.
+    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 SWITCH-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="switch_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="ch_switchaai_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="switch_serializeImported"/>
+        <property name="id" value="ch_switchaai_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/switch/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="switch_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="ch_switchaai_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="switch_import"/>
+        <property name="id" value="ch_switchaai_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchSwitchExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="switch_serializeImported"/>
+                <ref bean="ch_switchaai_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/switch/metadata.crt b/mdx/ch_switchaai/metadata.crt
similarity index 100%
rename from mdx/switch/metadata.crt
rename to mdx/ch_switchaai/metadata.crt