diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml
index 5e2782b6d..aa44ad050 100644
--- a/docs/src/reference/docbook/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -5,10 +5,10 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
     <bookinfo>
-        <title>Spring Data Key-Value - Reference Documentation</title>
-        <titleabbrev>Spring Data Key-Value ${version}</titleabbrev>
+        <title>Spring Data Redis Reference Documentation</title>
+        <titleabbrev>Spring Data Redis @version@</titleabbrev>
         <releaseinfo>@version@</releaseinfo>
-        <productname>Spring Data Key-Value</productname>
+        <productname>Spring Data Redis</productname>
 
         <authorgroup>
             <author>
@@ -16,11 +16,6 @@
                 <surname>Leau</surname>
                 <affiliation>SpringSource</affiliation>
             </author>
-            <author>
-                <firstname>Jon</firstname>
-                <surname>Brisbin</surname>
-                <affiliation>SpringSource</affiliation>
-            </author>
         </authorgroup>
 
         <legalnotice>
@@ -35,7 +30,6 @@
 
     <toc/>
     <xi:include href="preface.xml"/>
-    <!--
 
     <part id="introduction">
       <title>Introduction</title>
@@ -51,7 +45,6 @@
        
       <xi:include href="reference/introduction.xml"/>
       <xi:include href="reference/redis.xml"/>
-      <xi:include href="reference/riak.xml"/>
     </part>
 
     <part id="appendixes">
@@ -60,7 +53,6 @@
       <xi:include href="appendix/introduction.xml"/>
       <xi:include href="appendix/appendix-schema.xml"/>
     </part>
--->
     <!--
     <part id="resources">
       <title>Other Documentation</title>
diff --git a/gradle.properties b/gradle.properties
index 97bec7ca3..d3ecb7b24 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,6 +28,6 @@ rjc.range = "[0.6.4, 0.6.4]"
 # --------------------
 # Project wide version
 # --------------------
-springDataKeyValueVersion=1.0.0.BUILD-SNAPSHOT
-version = 'springDataKeyValueVersion'
+springDataRedisVersion=1.0.0.BUILD-SNAPSHOT
+version = 'springDataRedisVersion'
 
diff --git a/template.mf b/template.mf
index 6ec87743c..503c87fe5 100644
--- a/template.mf
+++ b/template.mf
@@ -16,7 +16,6 @@ Import-Template:
  org.springframework.transaction.support.*;version=${spring.range},
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.data.keyvalue.*;version=${version},
  org.w3c.dom.*;version="0",
  javax.xml.transform.*;resolution:="optional";version="0",
  org.jredis.*;version="[1.0.0, 2.0.0)",