diff --git a/spring-data-neo4j-examples/cineasts-aspects/pom.xml b/spring-data-neo4j-examples/cineasts-aspects/pom.xml
index b36375b73..bfe5ac3db 100644
--- a/spring-data-neo4j-examples/cineasts-aspects/pom.xml
+++ b/spring-data-neo4j-examples/cineasts-aspects/pom.xml
@@ -13,7 +13,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>3.1.0.RELEASE</spring.version>
 		<slf4j.version>1.6.1</slf4j.version>
-		<neo4j.version>1.8.M06</neo4j.version>
+		<neo4j.version>1.8</neo4j.version>
 		<spring-data-neo4j.version>${project.version}</spring-data-neo4j.version>
 		<aspectj.version>1.6.12</aspectj.version>
 	</properties>
diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java b/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java
index 5568c7239..18a051dff 100644
--- a/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java
+++ b/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java
@@ -12,6 +12,6 @@ public interface MovieRecommendation {
     @ResultColumn("otherMovie")
     Movie getMovie();
 
-    @ResultColumn("avg(r3.stars)")
+    @ResultColumn("rating")
     int getRating();
 }
diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java b/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
index 6cc6de47d..ed09f6c91 100644
--- a/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
+++ b/spring-data-neo4j-examples/cineasts-aspects/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
@@ -5,7 +5,9 @@ import org.neo4j.cineasts.domain.MovieRecommendation;
 import org.neo4j.cineasts.domain.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.neo4j.annotation.MapResult;
 import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.annotation.ResultColumn;
 import org.springframework.data.neo4j.repository.GraphRepository;
 import org.springframework.data.neo4j.repository.NamedIndexRepository;
 
@@ -20,12 +22,12 @@ public interface MovieRepository extends GraphRepository<Movie>, NamedIndexRepos
 
     Page<Movie> findByTitleLike(String title, Pageable page);
 
-    @Query("start user=node({0}) " +
-            " match user-[r:RATED]->movie<-[r2:RATED]-other-[r3:RATED]->otherMovie " +
-            " where r.stars >= 3 and r2.stars >= 3 and r3.stars >= 3 " +
-            " return otherMovie, avg(r3.stars) " +
-            " order by avg(r3.stars) desc, count(*) desc" +
-            " limit 10")
-    List<MovieRecommendation> getRecommendations(User user);
+    @Query( "start user=node({0}) " +
+                    " match user-[r:RATED]->movie<-[r2:RATED]-other-[r3:RATED]->otherMovie " +
+                    " where r.stars >= 3 and r2.stars >= r.stars and r3.stars >= r.stars " +
+                    " return otherMovie, avg(r3.stars) as rating, count(*) as cnt" +
+                    " order by rating desc, cnt desc" +
+                    " limit 10" )
+    List<MovieRecommendation> getRecommendations( User user );
 
 }
diff --git a/spring-data-neo4j-examples/cineasts-rest/pom.xml b/spring-data-neo4j-examples/cineasts-rest/pom.xml
index 7b49a2412..a508675dc 100644
--- a/spring-data-neo4j-examples/cineasts-rest/pom.xml
+++ b/spring-data-neo4j-examples/cineasts-rest/pom.xml
@@ -13,7 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.version>3.1.0.RELEASE</spring.version>
         <slf4j.version>1.6.1</slf4j.version>
-        <neo4j.version>1.8.M06</neo4j.version>
+        <neo4j.version>1.8</neo4j.version>
         <spring-data-neo4j.version>${project.version}</spring-data-neo4j.version>
         <aspectj.version>1.6.12</aspectj.version>
         <jersey.version>1.4</jersey.version>
diff --git a/spring-data-neo4j-examples/cineasts-rest/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java b/spring-data-neo4j-examples/cineasts-rest/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
index 4ee0987d0..408d6eb7e 100644
--- a/spring-data-neo4j-examples/cineasts-rest/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
+++ b/spring-data-neo4j-examples/cineasts-rest/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
@@ -20,9 +20,9 @@ public interface MovieRepository extends GraphRepository<Movie>, NamedIndexRepos
 
     @Query( "start user=node({0}) " +
                     " match user-[r:RATED]->movie<-[r2:RATED]-other-[r3:RATED]->otherMovie " +
-                    " where r.stars > 3 and r2.stars >= r.stars and r3.stars >= r.stars " +
-                    " return otherMovie, avg(r3.stars) " +
-                    " order by avg(r3.stars) desc, count(*) desc" +
+                    " where r.stars >= 3 and r2.stars >= r.stars and r3.stars >= r.stars " +
+                    " return otherMovie, avg(r3.stars) as rating, count(*) as cnt" +
+                    " order by rating desc, cnt desc" +
                     " limit 10" )
     List<MovieRecommendation> getRecommendations( User user );
 
@@ -31,7 +31,7 @@ public interface MovieRepository extends GraphRepository<Movie>, NamedIndexRepos
         @ResultColumn( "otherMovie" )
         Movie getMovie();
 
-        @ResultColumn( "count(*)" )
+        @ResultColumn( "rating" )
         int getRating();
     }
 
diff --git a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java
index 5568c7239..18a051dff 100644
--- a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java
+++ b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/MovieRecommendation.java
@@ -12,6 +12,6 @@ public interface MovieRecommendation {
     @ResultColumn("otherMovie")
     Movie getMovie();
 
-    @ResultColumn("avg(r3.stars)")
+    @ResultColumn("rating")
     int getRating();
 }
diff --git a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
index 6b85da3b0..002e8055e 100644
--- a/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
+++ b/spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/repository/MovieRepository.java
@@ -5,7 +5,9 @@ import org.neo4j.cineasts.domain.MovieRecommendation;
 import org.neo4j.cineasts.domain.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.neo4j.annotation.MapResult;
 import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.annotation.ResultColumn;
 import org.springframework.data.neo4j.repository.GraphRepository;
 import org.springframework.data.neo4j.repository.NamedIndexRepository;
 import org.springframework.data.neo4j.repository.RelationshipOperationsRepository;
@@ -23,12 +25,12 @@ public interface MovieRepository extends GraphRepository<Movie>,
 
     Page<Movie> findByTitleLike(String title, Pageable page);
 
-    @Query("start user=node({0}) " +
-            " match user-[r:RATED]->movie<-[r2:RATED]-other-[r3:RATED]->otherMovie " +
-            " where r.stars >= 3 and r2.stars >= 3 and r3.stars >= 3 " +
-            " return otherMovie, avg(r3.stars) " +
-            " order by avg(r3.stars) desc, count(*) desc" +
-            " limit 10")
-    List<MovieRecommendation> getRecommendations(User user);
-
+    @Query( "start user=node({0}) " +
+                    " match user-[r:RATED]->movie<-[r2:RATED]-other-[r3:RATED]->otherMovie " +
+                    " where r.stars >= 3 and r2.stars >= r.stars and r3.stars >= r.stars " +
+                    " return otherMovie, avg(r3.stars) as rating, count(*) as cnt" +
+                    " order by rating desc, cnt desc" +
+                    " limit 10" )
+    List<MovieRecommendation> getRecommendations( User user );
+        
 }
diff --git a/spring-data-neo4j-examples/myrestaurants-social/pom.xml b/spring-data-neo4j-examples/myrestaurants-social/pom.xml
index 98d47e05f..b5380f02d 100644
--- a/spring-data-neo4j-examples/myrestaurants-social/pom.xml
+++ b/spring-data-neo4j-examples/myrestaurants-social/pom.xml
@@ -11,7 +11,7 @@
 		<spring-data-neo4j.version>${project.version}</spring-data-neo4j.version>
 		<aspectj.version>1.6.12</aspectj.version>
 		<slf4j.version>1.6.1</slf4j.version>
-		<neo4j.version>1.8.M06</neo4j.version>
+		<neo4j.version>1.8</neo4j.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	    <spring-security.version>3.1.0.RELEASE</spring-security.version>
     </properties>
diff --git a/spring-data-neo4j-examples/todos/pom.xml b/spring-data-neo4j-examples/todos/pom.xml
index 29dc96204..500ff6a20 100644
--- a/spring-data-neo4j-examples/todos/pom.xml
+++ b/spring-data-neo4j-examples/todos/pom.xml
@@ -11,7 +11,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<neo4j.version>1.8.M06</neo4j.version>
+		<neo4j.version>1.8</neo4j.version>
 		<spring.version>3.1.0.RELEASE</spring.version>
 		<spring-data-neo4j.version>${project.version}</spring-data-neo4j.version>
 		<aspectj.version>1.6.12</aspectj.version>