diff --git a/spring-eai-core/.classpath b/spring-integration-core/.classpath
similarity index 100%
rename from spring-eai-core/.classpath
rename to spring-integration-core/.classpath
diff --git a/spring-eai-core/.project b/spring-integration-core/.project
similarity index 100%
rename from spring-eai-core/.project
rename to spring-integration-core/.project
diff --git a/spring-eai-core/build.xml b/spring-integration-core/build.xml
similarity index 100%
rename from spring-eai-core/build.xml
rename to spring-integration-core/build.xml
diff --git a/spring-eai-core/ivy.xml b/spring-integration-core/ivy.xml
similarity index 100%
rename from spring-eai-core/ivy.xml
rename to spring-integration-core/ivy.xml
diff --git a/spring-eai-core/resources/changelog.txt b/spring-integration-core/resources/changelog.txt
similarity index 100%
rename from spring-eai-core/resources/changelog.txt
rename to spring-integration-core/resources/changelog.txt
diff --git a/spring-eai-core/resources/license.txt b/spring-integration-core/resources/license.txt
similarity index 100%
rename from spring-eai-core/resources/license.txt
rename to spring-integration-core/resources/license.txt
diff --git a/spring-eai-core/resources/notice.txt b/spring-integration-core/resources/notice.txt
similarity index 100%
rename from spring-eai-core/resources/notice.txt
rename to spring-integration-core/resources/notice.txt
diff --git a/spring-eai-core/resources/readme.txt b/spring-integration-core/resources/readme.txt
similarity index 100%
rename from spring-eai-core/resources/readme.txt
rename to spring-integration-core/resources/readme.txt
diff --git a/spring-eai-core/src/main/java/META-INF/spring.handlers b/spring-integration-core/src/main/java/META-INF/spring.handlers
similarity index 100%
rename from spring-eai-core/src/main/java/META-INF/spring.handlers
rename to spring-integration-core/src/main/java/META-INF/spring.handlers
diff --git a/spring-eai-core/src/main/java/META-INF/spring.schemas b/spring-integration-core/src/main/java/META-INF/spring.schemas
similarity index 100%
rename from spring-eai-core/src/main/java/META-INF/spring.schemas
rename to spring-integration-core/src/main/java/META-INF/spring.schemas
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/MessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/MessageDeliveryException.java
rename to spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/MessageHandlingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/MessageHandlingException.java
rename to spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java
rename to spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/MessagingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/MessagingException.java
rename to spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/SystemInterruptedException.java b/spring-integration-core/src/main/java/org/springframework/integration/SystemInterruptedException.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/SystemInterruptedException.java
rename to spring-integration-core/src/main/java/org/springframework/integration/SystemInterruptedException.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/aop/AnnotationAwareMessagePublishingInterceptor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/aop/Publisher.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/Publisher.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/aop/Publisher.java
rename to spring-integration-core/src/main/java/org/springframework/integration/aop/Publisher.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/bus/ConsumerPolicy.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/ConsumerPolicy.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/bus/ConsumerPolicy.java
rename to spring-integration-core/src/main/java/org/springframework/integration/bus/ConsumerPolicy.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/bus/EndpointExecutor.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/EndpointExecutor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/bus/EndpointExecutor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/bus/EndpointExecutor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/bus/MessageBus.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/bus/MessageBus.java
rename to spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/bus/Subscription.java b/spring-integration-core/src/main/java/org/springframework/integration/bus/Subscription.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/bus/Subscription.java
rename to spring-integration-core/src/main/java/org/springframework/integration/bus/Subscription.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/channel/ChannelMapping.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelMapping.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/channel/ChannelMapping.java
rename to spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelMapping.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/channel/ConsumerType.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ConsumerType.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/channel/ConsumerType.java
rename to spring-integration-core/src/main/java/org/springframework/integration/channel/ConsumerType.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/channel/MessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/channel/MessageChannel.java
rename to spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java
rename to spring-integration-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/AnnotationDrivenParser.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/ChannelParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/ChannelParser.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/ComponentConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ComponentConfigurer.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/ComponentConfigurer.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/ComponentConfigurer.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/EndpointParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/EndpointParser.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/MessageBusParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/MessageBusParser.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/MessageBusParser.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/PublisherAnnotationPostProcessor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
rename to spring-integration-core/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/AbstractChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractChannelAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/AbstractChannelAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractChannelAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/AbstractInboundChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractInboundChannelAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/AbstractInboundChannelAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractInboundChannelAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/AbstractOutboundChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractOutboundChannelAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/AbstractOutboundChannelAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractOutboundChannelAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/ArgumentListPreparer.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/GenericMessageEndpoint.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/InboundMethodInvokingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/InboundMethodInvokingChannelAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/InboundMethodInvokingChannelAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/InboundMethodInvokingChannelAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/MessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageHandlerAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/MessageHandlerAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageHandlerAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodValidator.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/OutboundMethodInvokingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/OutboundMethodInvokingChannelAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/OutboundMethodInvokingChannelAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/OutboundMethodInvokingChannelAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/SimpleMethodInvoker.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/AnnotationHandlerCreator.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/AnnotationHandlerCreator.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/AnnotationHandlerCreator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/AnnotationHandlerCreator.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultAnnotationHandlerCreator.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultAnnotationHandlerCreator.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultAnnotationHandlerCreator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultAnnotationHandlerCreator.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/DefaultOutput.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/Handler.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Handler.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/Handler.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Handler.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpoint.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessor.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessor.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Polled.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/annotation/Subscriber.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/file/InboundFileAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/file/InboundFileAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/file/InboundFileAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/file/InboundFileAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/jms/JmsInboundAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/jms/JmsInboundAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/jms/JmsInboundAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/jms/JmsInboundAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/endpoint/jms/JmsOutboundAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/jms/JmsOutboundAdapter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/endpoint/jms/JmsOutboundAdapter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/jms/JmsOutboundAdapter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java
rename to spring-integration-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/handler/MessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandler.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/handler/MessageHandler.java
rename to spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandler.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
rename to spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/GenericMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/GenericMessage.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/Message.java b/spring-integration-core/src/main/java/org/springframework/integration/message/Message.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/Message.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/Message.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/MessageHeader.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHeader.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/MessageHeader.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/MessageHeader.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/MessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMapper.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/MessageMapper.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/MessageMapper.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/MessageSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSelector.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/MessageSelector.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/MessageSelector.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/SimplePayloadMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/message/SimplePayloadMessageMapper.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/SimplePayloadMessageMapper.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/SimplePayloadMessageMapper.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/message/StringMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/message/StringMessage.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/message/StringMessage.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/StringMessage.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/router/Aggregator.java b/spring-integration-core/src/main/java/org/springframework/integration/router/Aggregator.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/router/Aggregator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/Aggregator.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/router/ChannelNameResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/router/ChannelNameResolver.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/router/ChannelNameResolver.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/ChannelNameResolver.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/router/ChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/router/ChannelResolver.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/router/ChannelResolver.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/ChannelResolver.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/router/Resequencer.java b/spring-integration-core/src/main/java/org/springframework/integration/router/Resequencer.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/router/Resequencer.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/Resequencer.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/router/RoutingBarrier.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RoutingBarrier.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/router/RoutingBarrier.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/RoutingBarrier.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/router/Splitter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/Splitter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/router/Splitter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/router/Splitter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/samples/Logger.java b/spring-integration-core/src/main/java/org/springframework/integration/samples/Logger.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/samples/Logger.java
rename to spring-integration-core/src/main/java/org/springframework/integration/samples/Logger.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/samples/Quote.java b/spring-integration-core/src/main/java/org/springframework/integration/samples/Quote.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/samples/Quote.java
rename to spring-integration-core/src/main/java/org/springframework/integration/samples/Quote.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/samples/QuotePublisher.java b/spring-integration-core/src/main/java/org/springframework/integration/samples/QuotePublisher.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/samples/QuotePublisher.java
rename to spring-integration-core/src/main/java/org/springframework/integration/samples/QuotePublisher.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/samples/StockQuoteDemo.java b/spring-integration-core/src/main/java/org/springframework/integration/samples/StockQuoteDemo.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/samples/StockQuoteDemo.java
rename to spring-integration-core/src/main/java/org/springframework/integration/samples/StockQuoteDemo.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/samples/stockQuoteDemo.xml b/spring-integration-core/src/main/java/org/springframework/integration/samples/stockQuoteDemo.xml
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/samples/stockQuoteDemo.xml
rename to spring-integration-core/src/main/java/org/springframework/integration/samples/stockQuoteDemo.xml
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/transformer/MessageFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageFilter.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/transformer/MessageFilter.java
rename to spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageFilter.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/transformer/ObjectTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ObjectTransformer.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/transformer/ObjectTransformer.java
rename to spring-integration-core/src/main/java/org/springframework/integration/transformer/ObjectTransformer.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/util/RandomGuid.java b/spring-integration-core/src/main/java/org/springframework/integration/util/RandomGuid.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/util/RandomGuid.java
rename to spring-integration-core/src/main/java/org/springframework/integration/util/RandomGuid.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/util/RandomGuidUidGenerator.java b/spring-integration-core/src/main/java/org/springframework/integration/util/RandomGuidUidGenerator.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/util/RandomGuidUidGenerator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/util/RandomGuidUidGenerator.java
diff --git a/spring-eai-core/src/main/java/org/springframework/integration/util/UidGenerator.java b/spring-integration-core/src/main/java/org/springframework/integration/util/UidGenerator.java
similarity index 100%
rename from spring-eai-core/src/main/java/org/springframework/integration/util/UidGenerator.java
rename to spring-integration-core/src/main/java/org/springframework/integration/util/UidGenerator.java
diff --git a/spring-eai-core/src/test/java/log4j.properties b/spring-integration-core/src/test/java/log4j.properties
similarity index 100%
rename from spring-eai-core/src/test/java/log4j.properties
rename to spring-integration-core/src/test/java/log4j.properties
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/aop/ITestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/ITestBean.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/aop/ITestBean.java
rename to spring-integration-core/src/test/java/org/springframework/integration/aop/ITestBean.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
rename to spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/aop/publisherAnnotationPostProcessorTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/bus/EventDrivenConsumerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/EventDrivenConsumerTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/bus/EventDrivenConsumerTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/bus/EventDrivenConsumerTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/bus/FixedDelayConsumerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/FixedDelayConsumerTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/bus/FixedDelayConsumerTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/bus/FixedDelayConsumerTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/bus/FixedRateConsumerTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/ComponentConfigurerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ComponentConfigurerTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/ComponentConfigurerTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/config/ComponentConfigurerTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/TestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestBean.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/TestBean.java
rename to spring-integration-core/src/test/java/org/springframework/integration/config/TestBean.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/TestHandler.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/TestHandler.java
rename to spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/channelParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/channelParserTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/channelParserTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/config/channelParserTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/config/genericEndpointTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/config/handlerAdapterEndpointTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/AdapterBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/AdapterBusTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/AdapterBusTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/AdapterBusTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/GenericMessageEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/GenericMessageEndpointTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/GenericMessageEndpointTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/GenericMessageEndpointTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/InboundChannelAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/InboundChannelAdapterTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/InboundChannelAdapterTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/InboundChannelAdapterTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/OutboundChannelAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/OutboundChannelAdapterTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/OutboundChannelAdapterTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/OutboundChannelAdapterTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/TestSink.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/TestSink.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/TestSink.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/TestSink.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/TestSource.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/TestSource.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/TestSource.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/TestSource.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/adapterBusTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/adapterBusTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/adapterBusTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/adapterBusTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/InboundChannelAdapterTestBean.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/OutboundChannelAdapterTestBean.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/SimpleAnnotatedEndpoint.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml
rename to spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/simpleAnnotatedEndpointWithAutoCreateChannelTests.xml
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java
diff --git a/spring-eai-core/src/test/java/org/springframework/integration/util/RandomGuidUidGeneratorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/RandomGuidUidGeneratorTests.java
similarity index 100%
rename from spring-eai-core/src/test/java/org/springframework/integration/util/RandomGuidUidGeneratorTests.java
rename to spring-integration-core/src/test/java/org/springframework/integration/util/RandomGuidUidGeneratorTests.java