diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterParser.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterParser.java
index 1085e33529..161c3f26c3 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterParser.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterParser.java
@@ -46,7 +46,7 @@ public class MBeanExporterParser extends AbstractSingleBeanDefinitionParser {
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 		Object mbeanServer = getMBeanServer(element, parserContext);
 		builder.getRawBeanDefinition().setSource(parserContext.extractSource(element));
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "domain");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "default-domain");
 		builder.addPropertyValue("server", mbeanServer);
 	}
 
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
index 3c8c5dca25..d98780dcea 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
@@ -156,7 +156,7 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
 	 * 
 	 * @param domain the domain name to set
 	 */
-	public void setDomain(String domain) {
+	public void setDefaultDomain(String domain) {
 		this.domain = domain;
 	}
 
diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.0.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.0.xsd
index 241d3dbf3b..bcff9d33df 100644
--- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.0.xsd
+++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.0.xsd
@@ -105,7 +105,7 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="mbeanServerIdentifyerType">
-					<xsd:attribute name="domain" use="optional">
+					<xsd:attribute name="default-domain" use="optional">
 						<xsd:annotation>
 							<xsd:documentation>
 								The domain name for the MBeans exported by this Exporter.
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
index e11150b383..4bafcf3187 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
@@ -82,7 +82,7 @@ public class ControlBusOperationChannelTests {
 		context.registerBeanDefinition("mbeanServer", serverDef);
 		BeanDefinition exporterDef = new RootBeanDefinition(IntegrationMBeanExporter.class);
 		exporterDef.getPropertyValues().addPropertyValue("server", new RuntimeBeanReference("mbeanServer"));
-		exporterDef.getPropertyValues().addPropertyValue("domain", domain);
+		exporterDef.getPropertyValues().addPropertyValue("defaultDomain", domain);
 		context.registerBeanDefinition("exporter", exporterDef);
 		BeanDefinition controlBusDef = new RootBeanDefinition(ControlBus.class);
 		controlBusDef.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference("mbeanServer"));
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java
index 2dcfb6c44a..41ed89793c 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java
@@ -188,7 +188,7 @@ public class ControlBusTests {
 	private BeanDefinition registerControlBus(GenericApplicationContext context, String domain) {
 		BeanDefinition exporterDef = new RootBeanDefinition(IntegrationMBeanExporter.class);
 		exporterDef.getPropertyValues().addPropertyValue("server", new RuntimeBeanReference("mbeanServer"));
-		exporterDef.getPropertyValues().addPropertyValue("domain", domain);
+		exporterDef.getPropertyValues().addPropertyValue("defaultDomain", domain);
 		context.registerBeanDefinition("exporter", exporterDef);
 		BeanDefinition controlBusDef = new RootBeanDefinition(ControlBus.class);
 		controlBusDef.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference("mbeanServer"));
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
index d67f90ed0b..ce73230e21 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
@@ -29,7 +29,7 @@
 
 	<bean id="mbeanExporter" class="org.springframework.integration.monitor.IntegrationMBeanExporter">
 		<property name="server" ref="mbeanServer" />
-		<property name="domain" value="control.bus.xml.test" />
+		<property name="defaultDomain" value="control.bus.xml.test" />
 	</bean>
 
 	<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests-context.xml
index 9e6413ee02..998d5b86fe 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests-context.xml
@@ -19,6 +19,6 @@
 
 	<jmx:control-bus mbean-exporter="mbeanExporter" operation-channel="testChannel"/>
 
-	<jmx:mbean-export id="mbeanExporter" server="mbs" domain="tests.ControlBusParser"/>
+	<jmx:mbean-export id="mbeanExporter" server="mbs" default-domain="tests.ControlBusParser"/>
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml
index 96e186add0..a0f3e5e671 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml
@@ -17,6 +17,6 @@
 
 	<si:channel id="testChannel"/>
 
-	<jmx:mbean-export id="mbeanExporter" server="mbs" domain="tests.MBeanExpoerterParser"/>
+	<jmx:mbean-export id="mbeanExporter" server="mbs" default-domain="tests.MBeanExpoerterParser"/>
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests-context.xml
index eca2df4493..7947c69fc1 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests-context.xml
@@ -25,6 +25,6 @@
 	</int:payload-type-router>
 
 	<jmx:mbean-export id="mbeanExporter" server="mbs"
-		domain="tests.RouterMBean" />
+		default-domain="test.RouterMBean" />
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java
index c51fd6e47d..cdeedd62e8 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java
@@ -39,7 +39,7 @@ public class RouterMBeanTests {
 	
 	@Test
 	public void testRouterMBeanExists() throws Exception {
-		Set<ObjectName> names = server.queryNames(new ObjectName("*:type=MessageHandler,name=ptRouter,*"), null);
+		Set<ObjectName> names = server.queryNames(new ObjectName("test.RouterMBean:type=MessageHandler,name=ptRouter,*"), null);
 		assertEquals(1, names.size());
 	}
 
@@ -47,7 +47,7 @@ public class RouterMBeanTests {
 	public void testRouterMBeanOnlyRegisteredOnce() throws Exception {
 		// System.err.println(server.queryNames(new ObjectName("*:type=MessageHandler,*"), null));
 		// The errorLogger and the router
-		assertEquals(2, server.queryNames(new ObjectName("*:type=MessageHandler,*"), null).size());
+		assertEquals(2, server.queryNames(new ObjectName("test.RouterMBean:type=MessageHandler,*"), null).size());
 	}
 
 }
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml
index 3bc26ede32..481ec54291 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml
@@ -16,7 +16,7 @@
 
 	<bean id="mbeanExporter"
 		class="org.springframework.integration.monitor.IntegrationMBeanExporter"
-		p:server-ref="mbeanServer" p:domain="forum" />
+		p:server-ref="mbeanServer" p:defaultDomain="forum" />
 
 	<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"
 		p:locateExistingServerIfPossible="true" />
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java
index cb2fa19198..587f3db83e 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java
@@ -24,7 +24,7 @@ public class ChainWithMessageProducingHandlersTests {
 	private ApplicationContext applicationContext;
 	
 	@Test
-	public void testSuccessfullApplicationContext(){
+	public void testSuccessfulApplicationContext(){
 		// this is all we need to do. Until INT-1431 was solved initialization of this AC would fail.
 		assertNotNull(applicationContext);
 	}
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
index 564cca97a9..229aebceac 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
@@ -15,7 +15,7 @@
 
 	<bean id="mbeanExporter" class="org.springframework.integration.monitor.IntegrationMBeanExporter">
 		<property name="server" ref="mbeanServer" />
-		<property name="domain" value="test.ChannelIntegrationTests"/>
+		<property name="defaultDomain" value="test.ChannelIntegrationTests"/>
 	</bean>
 
 	<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ExponentialMovingAverageRateTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ExponentialMovingAverageRateTests.java
index 8b6b96d9c3..8a701a3d10 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ExponentialMovingAverageRateTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ExponentialMovingAverageRateTests.java
@@ -1,17 +1,14 @@
 /*
  * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
  */
 package org.springframework.integration.monitor;
 
@@ -27,8 +24,7 @@ import org.junit.Test;
  */
 public class ExponentialMovingAverageRateTests {
 
-	private ExponentialMovingAverageRate history = new ExponentialMovingAverageRate(
-			1., 10., 10);
+	private ExponentialMovingAverageRate history = new ExponentialMovingAverageRate(1., 10., 10);
 
 	@Test
 	public void testGetCount() {
@@ -49,7 +45,7 @@ public class ExponentialMovingAverageRateTests {
 		assertEquals(0, history.getMean(), 0.01);
 		Thread.sleep(20L);
 		history.increment();
-		assertEquals(50, history.getMean(), 10);
+		assertTrue(history.getMean() > 10);
 	}
 
 	@Test
@@ -59,9 +55,10 @@ public class ExponentialMovingAverageRateTests {
 		history.increment();
 		Thread.sleep(20L);
 		history.increment();
-		assertEquals(50, history.getMean(), 10);
+		double before = history.getMean();
+		assertTrue(before > 10);
 		Thread.sleep(20L);
-		assertEquals(35, history.getMean(), 10);
+		assertTrue(history.getMean() < before);
 	}
 
 	@Test
@@ -74,7 +71,7 @@ public class ExponentialMovingAverageRateTests {
 		history.increment();
 		Thread.sleep(18L);
 		// System.err.println(history);
-		assertTrue("Standard deviation should be non-zero: "+history, history.getStandardDeviation()>0);
+		assertTrue("Standard deviation should be non-zero: " + history, history.getStandardDeviation() > 0);
 	}
 
 }