diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParser.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParser.java
index 03bc5bfba8..c20050e5ce 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParser.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParser.java
@@ -39,7 +39,7 @@ public class AttributePollingChannelAdapterParser extends AbstractPollingInbound
 	protected String parseSource(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.integration.jmx.AttributePollingMessageSource");
-		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server", "server");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "object-name");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "attribute-name");
 		return BeanDefinitionReaderUtils.registerWithGeneratedName(
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxNamespaceHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxNamespaceHandler.java
index 4ae2ece98b..eff9e98816 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxNamespaceHandler.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/JmxNamespaceHandler.java
@@ -33,7 +33,7 @@ public class JmxNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 		this.registerBeanDefinitionParser("attribute-polling-channel-adapter", new AttributePollingChannelAdapterParser());
 		this.registerBeanDefinitionParser("notification-listening-channel-adapter", new NotificationListeningChannelAdapterParser());
 		this.registerBeanDefinitionParser("notification-publishing-channel-adapter", new NotificationPublishingChannelAdapterParser());
-		this.registerBeanDefinitionParser("mbean-exporter", new MBeanExporterParser());
+		this.registerBeanDefinitionParser("mbean-export", new MBeanExporterParser());
 		this.registerBeanDefinitionParser("control-bus", new ControlBusParser());
 	}
 
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 1af4ef2837..1085e33529 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
@@ -51,7 +51,7 @@ public class MBeanExporterParser extends AbstractSingleBeanDefinitionParser {
 	}
 
 	private Object getMBeanServer(Element element, ParserContext parserContext) {
-		String mbeanServer = element.getAttribute("mbean-server");
+		String mbeanServer = element.getAttribute("server");
 		if (StringUtils.hasText(mbeanServer)) {
 			return new RuntimeBeanReference(mbeanServer);
 		}
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParser.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParser.java
index 36739b5257..06bdfe53a8 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParser.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParser.java
@@ -48,7 +48,7 @@ public class NotificationListeningChannelAdapterParser extends AbstractSimpleBea
 			parserContext.getReaderContext().error("The 'channel' attribute is required.", source);
 		}
 		builder.addPropertyReference("outputChannel", channel);
-		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "notification-filter", "filter");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "handback");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "send-timeout");
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParser.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParser.java
index ad1134798b..55c22940e3 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParser.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParser.java
@@ -39,7 +39,7 @@ public class OperationInvokingChannelAdapterParser extends AbstractOutboundChann
 	protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.integration.jmx.OperationInvokingMessageHandler");
-		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "object-name");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "operation-name");
 		return builder.getBeanDefinition();
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayParser.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayParser.java
index fd05a28fd5..086d9e1825 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayParser.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayParser.java
@@ -37,7 +37,7 @@ public class OperationInvokingOutboundGatewayParser extends AbstractConsumerEndp
 			ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(
 							"org.springframework.integration.jmx.OperationInvokingMessageHandler");
-		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mbean-server", "server");
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "server");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "object-name");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "operation-name");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel", "outputChannel");
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 7ba105b519..241d3dbf3b 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
@@ -96,7 +96,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="mbean-exporter">
+	<xsd:element name="mbean-export">
 		<xsd:annotation>
 			<xsd:documentation>
 				Exports Message Channels and Endpoints as MBeans.
@@ -186,7 +186,7 @@
 
 	<xsd:complexType name="mbeanServerIdentifyerType">
 		<xsd:attribute name="id" type="xsd:ID" use="optional" />
-		<xsd:attribute name="mbean-server" type="xsd:string" default="mbeanServer">
+		<xsd:attribute name="server" type="xsd:string" default="mbeanServer">
 			<xsd:annotation>
 				<xsd:documentation>
 					Defines the name of the MBeanServer bean to connect to.
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests-context.xml
index 5381afcfe2..a393f0ad92 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests-context.xml
@@ -25,9 +25,7 @@
 			object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBean1"
 			attribute-name="FirstMessage"
 			auto-startup="false">
-		<si:poller max-messages-per-poll="1">
-			<si:interval-trigger interval="2000"/>
-		</si:poller>
+		<si:poller max-messages-per-poll="1" fixed-rate="2000"/>
 	</jmx:attribute-polling-channel-adapter>
 
 	<bean id="testBean1" class="org.springframework.integration.jmx.config.TestBean"/>
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 f79bf94597..9e6413ee02 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-exporter id="mbeanExporter" mbean-server="mbs" domain="tests.ControlBusParser"/>
+	<jmx:mbean-export id="mbeanExporter" server="mbs" 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 c19acfc5d3..96e186add0 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-exporter id="mbeanExporter" mbean-server="mbs" domain="tests.MBeanExpoerterParser"/>
+	<jmx:mbean-export id="mbeanExporter" server="mbs" domain="tests.MBeanExpoerterParser"/>
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
index 14b1f093d0..80c02eca68 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests-context.xml
@@ -13,14 +13,18 @@
 			http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd">
 
 	<context:mbean-server id="mbs" />
+	
+	<context:mbean-export server="mbs"/>
 
 	<int:channel id="testChannel" />
 	
 	<int:inbound-channel-adapter channel="testChannel" method="get">
 		<bean class="org.springframework.integration.jmx.config.PollingAdapterMBeanTests$Source"/>
-		<int:poller fixed-rate="5000"/>
+		<int:poller fixed-rate="5000" max-messages-per-poll="1"/>
 	</int:inbound-channel-adapter>
 	
 	<int:logging-channel-adapter channel="testChannel"/>
+	
+	<jmx:mbean-export server="mbs"/>
 
 </beans>
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
index 1a08698dce..47cfb3c5cf 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java
@@ -46,7 +46,6 @@ public class PollingAdapterMBeanTests {
 
 	public static class Source {
 		public String get() {
-			System.err.println("*** " + System.currentTimeMillis());
 			return "foo";
 		}
 	}
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 31190c0e19..a61e80e45d 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
@@ -17,14 +17,14 @@
 	<int:channel id="testChannel" />
 	<int:channel id="intChannel" />
 	<int:channel id="stringChannel" />
-	
+
 	<int:payload-type-router id="ptRouter"
 		input-channel="testChannel">
 		<int:mapping type="java.lang.String" channel="stringChannel" />
 		<int:mapping type="java.lang.Integer" channel="intChannel" />
 	</int:payload-type-router>
 
-	<jmx:mbean-exporter id="mbeanExporter" mbean-server="mbs"
+	<jmx:mbean-export id="mbeanExporter" server="mbs"
 		domain="tests.MBeanExpoerterParser" />
 
 </beans>