diff --git a/build.xml b/build.xml
index 7dd0cfbe..abe6e09b 100644
--- a/build.xml
+++ b/build.xml
@@ -1101,8 +1101,8 @@
         *******************************************************************
     -->
     
-    <target name="flow.aaf.import">
-    	<CHANNEL.import channel="aaf"/>
+    <target name="flow.au_aaf.import">
+    	<CHANNEL.import channel="au_aaf"/>
     </target>
     
     <target name="flow.caf.import">
diff --git a/mdx/aaf/aaf-metadata-cert.pem b/mdx/au_aaf/aaf-metadata-cert.pem
similarity index 100%
rename from mdx/aaf/aaf-metadata-cert.pem
rename to mdx/au_aaf/aaf-metadata-cert.pem
diff --git a/mdx/aaf/beans.xml b/mdx/au_aaf/beans.xml
similarity index 94%
rename from mdx/aaf/beans.xml
rename to mdx/au_aaf/beans.xml
index 51174904..81f76ee2 100644
--- a/mdx/aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Common beans for AAF 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="aafSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/aaf/aaf-metadata-cert.pem"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/aaf-metadata-cert.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/aaf/import.xml b/mdx/au_aaf/import.xml
similarity index 74%
rename from mdx/aaf/import.xml
rename to mdx/au_aaf/import.xml
index 8df75bb5..d815e5b7 100644
--- a/mdx/aaf/import.xml
+++ b/mdx/au_aaf/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from AAF.
+    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 AAF-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="aaf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="au_aaf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="aaf_serializeImported"/>
+        <property name="id" value="au_aaf_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/aaf/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="aaf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="au_aaf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="aaf_import"/>
+        <property name="id" value="au_aaf_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchAafExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="aaf_serializeImported"/>
+                <ref bean="au_aaf_serializeImported"/>
             </list>
         </property>
     </bean>