diff --git a/build.xml b/build.xml
index abe6e09b..15930fab 100644
--- a/build.xml
+++ b/build.xml
@@ -1105,8 +1105,8 @@
     	<CHANNEL.import channel="au_aaf"/>
     </target>
     
-    <target name="flow.caf.import">
-        <CHANNEL.import channel="caf"/>
+    <target name="flow.ca_caf.import">
+        <CHANNEL.import channel="ca_caf"/>
     </target>
     
 	<target name="flow.cz_eduid.import">
diff --git a/mdx/caf/beans.xml b/mdx/ca_caf/beans.xml
similarity index 94%
rename from mdx/caf/beans.xml
rename to mdx/ca_caf/beans.xml
index 733ff20e..6f354f5f 100644
--- a/mdx/caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Common beans for CAF 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="cafSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/caf/cafshib_metadata_verify.pem"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/cafshib_metadata_verify.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/caf/cafshib_metadata_verify.pem b/mdx/ca_caf/cafshib_metadata_verify.pem
similarity index 100%
rename from mdx/caf/cafshib_metadata_verify.pem
rename to mdx/ca_caf/cafshib_metadata_verify.pem
diff --git a/mdx/caf/import.xml b/mdx/ca_caf/import.xml
similarity index 78%
rename from mdx/caf/import.xml
rename to mdx/ca_caf/import.xml
index b1a54c36..d5abd10f 100644
--- a/mdx/caf/import.xml
+++ b/mdx/ca_caf/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from CAF.
+    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 CAF-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="caf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="ca_caf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="caf_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/caf/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="caf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="ca_caf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="caf_import"/>
+        <property name="id" value="ca_caf_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchCafExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="caf_serializeImported"/>
+                <ref bean="ca_caf_serializeImported"/>
             </list>
         </property>
     </bean>