diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
index a1b6e98de5..ef920906de 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
@@ -44,7 +44,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa
 
 	private static final String VERSION = "2.1";
 
-	public static final String CHANNEL_INITIALIZER_BEAN_NAME = ChannelInitializer.class.getSimpleName();
+	public static final String CHANNEL_INITIALIZER_BEAN_NAME = "channelInitializer";
 
 	private static final String DEFAULT_CONFIGURING_POSTPROCESSOR_SIMPLE_CLASS_NAME =
 			"DefaultConfiguringBeanFactoryPostProcessor";
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml
index 47524a4334..2f5fa9dfa6 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml
@@ -7,7 +7,7 @@
 
 	<int:service-activator input-channel="inputChannel" expression="'hello'"/>
 
-	<bean id="ChannelInitializer" class="org.springframework.integration.config.xml.ChannelInitializer">
+	<bean id="channelInitializer" class="org.springframework.integration.config.xml.ChannelInitializer">
 		<property name="autoCreate" value="false"/>
 	</bean>
 
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml
index 18d97ef9ad..1cdcc87adf 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd">
 
-	<bean id="ChannelInitializer" class="org.springframework.integration.config.xml.ChannelInitializer">
+	<bean id="channelInitializer" class="org.springframework.integration.config.xml.ChannelInitializer">
 		<property name="autoCreate" value="false"/>
 	</bean>