diff --git a/spring-integration-samples/inbound-adapter-osgi/.classpath b/spring-integration-samples/osgi-inbound/.classpath
similarity index 100%
rename from spring-integration-samples/inbound-adapter-osgi/.classpath
rename to spring-integration-samples/osgi-inbound/.classpath
diff --git a/spring-integration-samples/inbound-adapter-osgi/.project b/spring-integration-samples/osgi-inbound/.project
similarity index 95%
rename from spring-integration-samples/inbound-adapter-osgi/.project
rename to spring-integration-samples/osgi-inbound/.project
index 4dab9a7607..2d2281c566 100644
--- a/spring-integration-samples/inbound-adapter-osgi/.project
+++ b/spring-integration-samples/osgi-inbound/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>inbound-adapter-osgi</name>
+	<name>osgi-inbound</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-samples/inbound-adapter-osgi/.settings/com.springsource.server.ide.jdt.core.prefs b/spring-integration-samples/osgi-inbound/.settings/com.springsource.server.ide.jdt.core.prefs
similarity index 100%
rename from spring-integration-samples/inbound-adapter-osgi/.settings/com.springsource.server.ide.jdt.core.prefs
rename to spring-integration-samples/osgi-inbound/.settings/com.springsource.server.ide.jdt.core.prefs
diff --git a/spring-integration-samples/inbound-adapter-osgi/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-integration-samples/osgi-inbound/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from spring-integration-samples/inbound-adapter-osgi/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to spring-integration-samples/osgi-inbound/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/spring-integration-samples/outbound-adapter-osgi/.springBeans b/spring-integration-samples/osgi-inbound/.springBeans
similarity index 81%
rename from spring-integration-samples/outbound-adapter-osgi/.springBeans
rename to spring-integration-samples/osgi-inbound/.springBeans
index 8ce10353c2..d079ca1bc0 100644
--- a/spring-integration-samples/outbound-adapter-osgi/.springBeans
+++ b/spring-integration-samples/osgi-inbound/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.2.5.200906231226-RC1]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.4.RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
diff --git a/spring-integration-samples/inbound-adapter-osgi/build.xml b/spring-integration-samples/osgi-inbound/build.xml
similarity index 100%
rename from spring-integration-samples/inbound-adapter-osgi/build.xml
rename to spring-integration-samples/osgi-inbound/build.xml
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF b/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
similarity index 57%
rename from spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF
rename to spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
index ddd0b6c932..7d7d7e8f1e 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-Version: 1.0.3
-Bundle-Name: Inbound_adapter_osgi
+Bundle-Name: org.springframework.integration.samples.osgi.inbound
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: inbound_adapter_osgi
-Bundle-Activator: org.springframework.integration.samples.inbound.InboundDemoBundleActivator
+Bundle-SymbolicName: org.springframework.integration.samples.osgi.inbound
+Bundle-Activator: org.springframework.integration.samples.osgi.inbound.InboundDemoBundleActivator
 Import-Package: org.eclipse.osgi.framework.console;version="1.0.0",
  org.osgi.framework;version="1.4.0",
  org.osgi.service.packageadmin;version="1.2.0",
@@ -11,4 +11,4 @@ Import-Package: org.eclipse.osgi.framework.console;version="1.0.0",
 Import-Library: org.aspectj;version="[1.6.2, 2.0.0)",
  org.springframework.spring;version="[2.5.6.A, 3.1.0)"
 Import-Bundle: org.springframework.integration;version="[1.0.3,1.0.4)",
- org.springframework.integration.file;version="[1.0.3,1.0.4)"    
+ org.springframework.integration.file;version="[1.0.3,1.0.4)"
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml b/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
similarity index 71%
rename from spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml
rename to spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
index 26e2028d84..c8898e8ba0 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/META-INF/spring/context-osgi-in.xml
+++ b/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
 		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:osgi="http://www.springframework.org/schema/osgi"
-	xmlns:integration="http://www.springframework.org/schema/integration"
-	xmlns:file="http://www.springframework.org/schema/integration/file">
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+
+	<integration:gateway id="inboundGateway"
+			service-interface="org.springframework.integration.samples.osgi.inbound.InboundGateway" 
+			default-request-channel="inboundChannel"/>
+
+	<integration:publish-subscribe-channel id="inboundChannel"/>
+
+    <osgi:service id="inboundService" ref="inboundChannel"
+    		interface="org.springframework.integration.channel.SubscribableChannel"/>
 
-	<integration:gateway id="inboundGateway" service-interface="org.springframework.integration.samples.inbound.InboundGateway"
-	                     default-request-channel="inChannel"/>
-	
-	<integration:publish-subscribe-channel id="inChannel"/>
-	 
-    <osgi:service  id="inboundService" ref="inChannel" interface="org.springframework.integration.channel.SubscribableChannel" />
- 
 </beans>   
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java b/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundDemoBundleActivator.java
similarity index 98%
rename from spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java
rename to spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundDemoBundleActivator.java
index 982f8d5493..d0befa6164 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundDemoBundleActivator.java
+++ b/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundDemoBundleActivator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.samples.inbound;
+package org.springframework.integration.samples.osgi.inbound;
 
 import java.io.File;
 import java.util.Dictionary;
diff --git a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java b/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java
similarity index 93%
rename from spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java
rename to spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java
index 8239126f45..e835c3bae6 100644
--- a/spring-integration-samples/inbound-adapter-osgi/src/org/springframework/integration/samples/inbound/InboundGateway.java
+++ b/spring-integration-samples/osgi-inbound/src/org/springframework/integration/samples/osgi/inbound/InboundGateway.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.samples.inbound;
+package org.springframework.integration.samples.osgi.inbound;
 
 import java.io.File;
 
diff --git a/spring-integration-samples/outbound-adapter-osgi/.classpath b/spring-integration-samples/osgi-outbound/.classpath
similarity index 100%
rename from spring-integration-samples/outbound-adapter-osgi/.classpath
rename to spring-integration-samples/osgi-outbound/.classpath
diff --git a/spring-integration-samples/outbound-adapter-osgi/.project b/spring-integration-samples/osgi-outbound/.project
similarity index 95%
rename from spring-integration-samples/outbound-adapter-osgi/.project
rename to spring-integration-samples/osgi-outbound/.project
index d8ec1a82b1..e9d513d969 100644
--- a/spring-integration-samples/outbound-adapter-osgi/.project
+++ b/spring-integration-samples/osgi-outbound/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>outbound-adapter-osgi</name>
+	<name>osgi-outbound</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/spring-integration-samples/outbound-adapter-osgi/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-integration-samples/osgi-outbound/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from spring-integration-samples/outbound-adapter-osgi/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to spring-integration-samples/osgi-outbound/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/spring-integration-samples/inbound-adapter-osgi/.springBeans b/spring-integration-samples/osgi-outbound/.springBeans
similarity index 81%
rename from spring-integration-samples/inbound-adapter-osgi/.springBeans
rename to spring-integration-samples/osgi-outbound/.springBeans
index 8ce10353c2..d079ca1bc0 100644
--- a/spring-integration-samples/inbound-adapter-osgi/.springBeans
+++ b/spring-integration-samples/osgi-outbound/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.2.5.200906231226-RC1]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.4.RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
diff --git a/spring-integration-samples/outbound-adapter-osgi/build.xml b/spring-integration-samples/osgi-outbound/build.xml
similarity index 100%
rename from spring-integration-samples/outbound-adapter-osgi/build.xml
rename to spring-integration-samples/osgi-outbound/build.xml
diff --git a/spring-integration-samples/outbound-adapter-osgi/src/META-INF/MANIFEST.MF b/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
similarity index 67%
rename from spring-integration-samples/outbound-adapter-osgi/src/META-INF/MANIFEST.MF
rename to spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
index d63e251e4d..4c6447f2cd 100644
--- a/spring-integration-samples/outbound-adapter-osgi/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-Version: 1.0.3
-Bundle-Name: Outbound_adapter_osgi
+Bundle-Name: org.springframework.integration.samples.osgi.outbound
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: outbound_adapter_osgi
+Bundle-SymbolicName: org.springframework.integration.samples.osgi.outbound
 Import-Library: org.aspectj;version="[1.6.2, 2.0.0)",
  org.springframework.spring;version="[2.5.6.A, 3.1.0)"
 Import-Bundle: org.springframework.integration;version="[1.0.3, 1.0.4)",
diff --git a/spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml b/spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml
similarity index 56%
rename from spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml
rename to spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml
index 3fc8d5117e..2ebf2c1e5c 100644
--- a/spring-integration-samples/outbound-adapter-osgi/src/META-INF/spring/context-osgi-out.xml
+++ b/spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
 		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:osgi="http://www.springframework.org/schema/osgi"
-	xmlns:integration="http://www.springframework.org/schema/integration"
-	xmlns:file="http://www.springframework.org/schema/integration/file">
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
 
-	
-	<osgi:reference  id="filesInService" interface="org.springframework.integration.channel.SubscribableChannel" cardinality="0..1"/>
-	
-	<file:outbound-gateway request-channel="filesInService" id="filesOut" directory="${java.io.tmpdir}/spring-integration-samples/output" delete-source-files="true" />
+	<osgi:reference id="filesIn"
+			interface="org.springframework.integration.channel.SubscribableChannel"
+			cardinality="0..1"/>
+
+	<file:outbound-gateway id="filesOut"
+			request-channel="filesIn"
+			directory="${java.io.tmpdir}/spring-integration-samples/output"
+			delete-source-files="true"/>
 
 </beans>