diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index 9252af0ce..ca973cf55 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.data.neo4j
-Bundle-Name: Spring Data Neo4J
+Bundle-SymbolicName: org.springframework.data.neo4j.cross_store
+Bundle-Name: Spring Data Neo4J Cross-Store
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package:
diff --git a/spring-data-neo4j-examples/myrestaurants-social/.classpath b/spring-data-neo4j-examples/myrestaurants-social/.classpath
index 8ca155bb0..91a52ebb0 100644
--- a/spring-data-neo4j-examples/myrestaurants-social/.classpath
+++ b/spring-data-neo4j-examples/myrestaurants-social/.classpath
@@ -13,5 +13,10 @@
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="/spring-data-neo4j-aspects/target/spring-data-neo4j-aspects-2.0.0.BUILD-SNAPSHOT.jar">
+		<attributes>
+			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index a7fe7abfb..a9bddb77c 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.data.neo4j
-Bundle-Name: Spring Data Neo4J
+Bundle-SymbolicName: org.springframework.data.neo4j.rest
+Bundle-Name: Spring Data Neo4J REST
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: