diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionAwareEndpointParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml
similarity index 100%
rename from org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionAwareEndpointParserTests-context.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests-context.xml
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
index 054f41f59a..a0229f8e74 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
@@ -11,7 +11,7 @@ splitter-inner-success=\
 		<queue capacity="2" /> \
 	</channel> \
 	<splitter id="testSplitter" input-channel="inChannel" output-channel="outChannel"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestSplitter" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 	</splitter>  \
 </beans:beans>
 splitter-ref-success=\
@@ -27,7 +27,7 @@ splitter-ref-success=\
 		<queue capacity="2" /> \
 	</channel> \
 	<splitter id="testSplitter" ref="splitterBean" input-channel="inChannel" output-channel="outChannel"/> \
-	<beans:bean id="splitterBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestSplitter" /> \
+	<beans:bean id="splitterBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 </beans:beans>
 splitter-failure-refAndBean=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -42,9 +42,9 @@ splitter-failure-refAndBean=\
 		<queue capacity="2" /> \
 	</channel> \
 	<splitter id="testSplitter" ref="splitterBean" input-channel="inChannel" output-channel="outChannel"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestSplitter" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 	</splitter> \
-	<beans:bean id="splitterBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestSplitter" /> \
+	<beans:bean id="splitterBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 </beans:beans>
 transformer-inner-success=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -59,7 +59,7 @@ transformer-inner-success=\
 		<queue capacity="1" /> \
 	</channel> \
 	<transformer id="testTransformer" input-channel="inChannel" output-channel="outChannel"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestTransformer" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestTransformer" /> \
 	</transformer>  \
 </beans:beans>
 transformer-ref-success=\
@@ -75,7 +75,7 @@ transformer-ref-success=\
 		<queue capacity="1" /> \
 	</channel> \
 	<transformer id="testTransformer" ref="testTransformerBean" input-channel="inChannel" output-channel="outChannel"/> \
-	<beans:bean id="testTransformerBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestTransformer" /> \
+	<beans:bean id="testTransformerBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestTransformer" /> \
 </beans:beans>
 transformer-failure-refAndBean=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -89,10 +89,10 @@ transformer-failure-refAndBean=\
 	<channel id="outChannel"> \
 		<queue capacity="1" /> \
 	</channel> \
-	<splitter id="testTransformer" ref="testTransformerBean" input-channel="inChannel" output-channel="outChannel"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestTransformer" /> \
-	</splitter> \
-	<beans:bean id="testTransformerBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestTransformer" /> \
+	<transformer id="testTransformer" ref="testTransformerBean" input-channel="inChannel" output-channel="outChannel"> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestTransformer" /> \
+	</transformer> \
+	<beans:bean id="testTransformerBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestTransformer" /> \
 </beans:beans>
 router-inner-success=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -110,7 +110,7 @@ router-inner-success=\
 		<queue capacity="1" /> \
 	</channel> \
 	<router id="testRouter" input-channel="inChannel" method="route"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestRouter" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestRouter" /> \
 	</router>  \
 </beans:beans>
 router-ref-success=\
@@ -129,7 +129,7 @@ router-ref-success=\
 		<queue capacity="1" /> \
 	</channel> \
 	<router id="testRouter" ref="testRouterBean" input-channel="inChannel" method="route"/> \
-	<beans:bean id="testRouterBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestRouter" /> \
+	<beans:bean id="testRouterBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestRouter" /> \
 </beans:beans>
 router-failure-refAndBean=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -141,9 +141,9 @@ router-failure-refAndBean=\
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"> \
 	<channel id="inChannel"/> \
 	<router id="testRouter" ref="testRouterBean" input-channel="inChannel" method="route"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestRouter" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestRouter" /> \
 	<router/> \
-	<beans:bean id="testRouterBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestRouter" /> \
+	<beans:bean id="testRouterBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestRouter" /> \
 </beans:beans>
 sa-inner-success=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -158,7 +158,7 @@ sa-inner-success=\
 		<queue capacity="1" /> \
 	</channel> \
 	<service-activator id="testServiceActivator" input-channel="inChannel" output-channel = "outChannel" method="foo"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestServiceActivator" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestServiceActivator" /> \
 	</service-activator>  \
 </beans:beans>
 sa-ref-success=\
@@ -174,7 +174,7 @@ sa-ref-success=\
 		<queue capacity="1" /> \
 	</channel> \
 	<service-activator id="testServiceActivator" ref="testServiceActivatorBean" input-channel="inChannel" output-channel = "outChannel" method="foo"/> \
-	<beans:bean id="testServiceActivatorBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestServiceActivator" /> \
+	<beans:bean id="testServiceActivatorBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestServiceActivator" /> \
 </beans:beans>
 sa-failure-refAndBean=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -189,7 +189,7 @@ sa-failure-refAndBean=\
 		<queue capacity="1" /> \
 	</channel> \
 	<service-activator id="testServiceActivator" ref="testServiceActivatorBean" input-channel="inChannel" output-channel = "outChannel" method="foo"> \
-		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestServiceActivator" /> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestServiceActivator" /> \
 	</service-activator>  \
-	<beans:bean id="testServiceActivatorBean" class="org.springframework.integration.config.xml.InnerDefinitionAwareEndpointParserTests$TestServiceActivator" /> \
+	<beans:bean id="testServiceActivatorBean" class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestServiceActivator" /> \
 </beans:beans>
\ No newline at end of file