diff --git a/spring-datastore-couchdb/template.mf b/spring-datastore-couchdb/template.mf
index df1b6a1c8..0433dcb21 100644
--- a/spring-datastore-couchdb/template.mf
+++ b/spring-datastore-couchdb/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.datastore.document
-Bundle-Name: Spring Datastore Document
+Bundle-SymbolicName: org.springframework.datastore.couchdb
+Bundle-Name: Spring Datastore Couch DB Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
diff --git a/spring-datastore-document-core/pom.xml b/spring-datastore-document-core/pom.xml
index 4d2d7ebda..68fa3cb2a 100644
--- a/spring-datastore-document-core/pom.xml
+++ b/spring-datastore-document-core/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>spring-datastore-document-core</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Datastore Document Database Support</name>
+	<name>Spring Datastore Document Datastore Support</name>
 	<dependencies>
 
 		<!--  Spring -->
diff --git a/spring-datastore-mongodb/template.mf b/spring-datastore-mongodb/template.mf
index 4c2cb3f87..4b0475461 100644
--- a/spring-datastore-mongodb/template.mf
+++ b/spring-datastore-mongodb/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.datastore.document
-Bundle-Name: Spring Datastore Document
+Bundle-SymbolicName: org.springframework.datastore.mongodb
+Bundle-Name: Spring Datastore Mongo DB Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index c00e3f99b..eda770ae8 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -18,7 +18,6 @@
 			<includes>
 				<include>readme.txt</include>
 				<include>apache-license.txt</include>
-				<include>epl-license.txt</include>
 				<include>notice.txt</include>
 				<include>changelog.txt</include>
 			</includes>