diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfig-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests-context.xml
similarity index 84%
rename from org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfig-context.xml
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests-context.xml
index bca409befd..f3ae55138b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfig-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests-context.xml
@@ -5,7 +5,8 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"
 	xmlns:si="http://www.springframework.org/schema/integration">
 
-	<si:gateway id="myGateway" service-interface="org.springframework.integration.gateway.MultiMethodGatewayConfig$TestGateway"
+	<si:gateway id="myGateway"
+			service-interface="org.springframework.integration.gateway.MultiMethodGatewayConfigTests$TestGateway"
 			default-request-channel="inputC">
 		<si:method name="echo" request-channel="inputA" reply-timeout="2" request-timeout="200"/>
     	<si:method name="echoUpperCase" request-channel="inputB"/>
@@ -14,17 +15,17 @@
 				
 	<si:channel id="inputA"/>
 	<si:service-activator input-channel="inputA" method="echo">
-		<bean class="org.springframework.integration.gateway.MultiMethodGatewayConfig$TestBeanA"/>
+		<bean class="org.springframework.integration.gateway.MultiMethodGatewayConfigTests$TestBeanA"/>
 	</si:service-activator>
-	<!-- 	-->
+
 	<si:channel id="inputB"/>
 	<si:service-activator input-channel="inputB" method="echo">
-		<bean class="org.springframework.integration.gateway.MultiMethodGatewayConfig$TestBeanB"/>
+		<bean class="org.springframework.integration.gateway.MultiMethodGatewayConfigTests$TestBeanB"/>
 	</si:service-activator>
 	
 	<si:channel id="inputC"/>
 	<si:service-activator input-channel="inputC" method="echo">
-		<bean class="org.springframework.integration.gateway.MultiMethodGatewayConfig$TestBeanC"/>
+		<bean class="org.springframework.integration.gateway.MultiMethodGatewayConfigTests$TestBeanC"/>
 	</si:service-activator>
 
 </beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfig.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java
similarity index 70%
rename from org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfig.java
rename to org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java
index 9c967cbf4d..91c974e14c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfig.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.gateway;
 
 import junit.framework.Assert;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -30,40 +32,47 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class MultiMethodGatewayConfig {
-	
+public class MultiMethodGatewayConfigTests {
+
 	@Autowired
 	private ApplicationContext applicationContext;
+
+
 	@Test
-	public void validateGatewayMethods(){
+	public void validateGatewayMethods() {
 		TestGateway gateway = (TestGateway) applicationContext.getBean("myGateway");
-		Assert.assertEquals(gateway.echo("oleg"), 
-						"org.springframework.integration.gateway.MultiMethodGatewayConfig$TestBeanA:oleg");
+		String parentClassName = "org.springframework.integration.gateway.MultiMethodGatewayConfigTests"; 
+		Assert.assertEquals(gateway.echo("oleg"),
+				parentClassName + "$TestBeanA:oleg");
 		Assert.assertEquals(gateway.echoUpperCase("oleg"), 
-						"org.springframework.integration.gateway.MultiMethodGatewayConfig$TestBeanB:oleg");
+				parentClassName + "$TestBeanB:oleg");
 		Assert.assertEquals(gateway.echoViaDefault("oleg"), 
-						"org.springframework.integration.gateway.MultiMethodGatewayConfig$TestBeanC:oleg");
+				parentClassName + "$TestBeanC:oleg");
 	}
-	
-	public static class TestBeanA{
-		public String echo(String str){
+
+
+	public static class TestBeanA {
+		public String echo(String str) {
 			return this.getClass().getName() + ":" + str;
 		}
 	}
-	public static class TestBeanB{
-		public String echo(String str){
+
+	public static class TestBeanB {
+		public String echo(String str) {
 			return this.getClass().getName() + ":" + str;
 		}
 	}
-	public static class TestBeanC{
-		public String echo(String str){
+
+	public static class TestBeanC {
+		public String echo(String str) {
 			return this.getClass().getName() + ":" + str;
 		}
 	}
-	
-	public static interface TestGateway{
+
+	public static interface TestGateway {
 		public String echo(String str);
 		public String echoViaDefault(String str);
 		public String echoUpperCase(String str);
 	}
+
 }