diff --git a/jpa/pom.xml b/jpa/pom.xml
index ddd8bc01..3d6a9f6b 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -21,12 +21,12 @@
 		<module>showcase</module>
 		<module>interceptors</module>
 		<module>java8</module>
-		<module>javaslang</module>
 		<module>jpa21</module>
 		<module>security</module>
 		<module>multiple-datasources</module>
 		<module>eclipselink</module>
 		<module>query-by-example</module>
+		<module>vavr</module>
 	</modules>
 
 	<properties>
diff --git a/jpa/javaslang/pom.xml b/jpa/vavr/pom.xml
similarity index 68%
rename from jpa/javaslang/pom.xml
rename to jpa/vavr/pom.xml
index 0971a39e..ca6686b7 100644
--- a/jpa/javaslang/pom.xml
+++ b/jpa/vavr/pom.xml
@@ -6,16 +6,17 @@
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-jpa-examples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>spring-data-jpa-javaslang</artifactId>
-	<name>Spring Data JPA - Javaslang integration</name>
+	<artifactId>spring-data-jpa-vavr</artifactId>
+	<name>Spring Data JPA - Vavr integration</name>
 
 	<dependencies>
 		<dependency>
-			<groupId>io.javaslang</groupId>
-			<artifactId>javaslang</artifactId>
-			<version>2.0.5</version>
+			<groupId>io.vavr</groupId>
+			<artifactId>vavr</artifactId>
+			<version>0.9.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/jpa/javaslang/src/main/java/example/Person.java b/jpa/vavr/src/main/java/example/Person.java
similarity index 100%
rename from jpa/javaslang/src/main/java/example/Person.java
rename to jpa/vavr/src/main/java/example/Person.java
diff --git a/jpa/javaslang/src/main/java/example/PersonRepository.java b/jpa/vavr/src/main/java/example/PersonRepository.java
similarity index 72%
rename from jpa/javaslang/src/main/java/example/PersonRepository.java
rename to jpa/vavr/src/main/java/example/PersonRepository.java
index d96cb68e..24e3d1f6 100644
--- a/jpa/javaslang/src/main/java/example/PersonRepository.java
+++ b/jpa/vavr/src/main/java/example/PersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package example;
 
-import javaslang.collection.Map;
-import javaslang.collection.Seq;
-import javaslang.collection.Set;
-import javaslang.control.Option;
+import io.vavr.collection.Map;
+import io.vavr.collection.Seq;
+import io.vavr.collection.Set;
+import io.vavr.control.Option;
 
 import java.util.List;
 import java.util.Optional;
@@ -26,8 +26,8 @@ import java.util.Optional;
 import org.springframework.data.repository.Repository;
 
 /**
- * Repository interface showing the usage of Javaslang collections and its {@link Option} type as repository query
- * method return types.
+ * Repository interface showing the usage of Vavr collections and its {@link Option} type as repository query method
+ * return types.
  * 
  * @author Oliver Gierke
  */
@@ -44,8 +44,8 @@ public interface PersonRepository extends Repository<Person, Long> {
 	Option<Person> findById(Long id);
 
 	/**
-	 * {@link Seq} can be used as alternative to JDK's {@link List}. Javaslang's {@link Set} and {@link Map} are
-	 * supported, too, and transparently mapped from their JDK counterparts.
+	 * {@link Seq} can be used as alternative to JDK's {@link List}. Vavr's {@link Set} and {@link Map} are supported,
+	 * too, and transparently mapped from their JDK counterparts.
 	 * 
 	 * @param firstname
 	 * @return
diff --git a/jpa/javaslang/src/test/java/example/PersonRepositoryIntegrationTests.java b/jpa/vavr/src/test/java/example/PersonRepositoryIntegrationTests.java
similarity index 89%
rename from jpa/javaslang/src/test/java/example/PersonRepositoryIntegrationTests.java
rename to jpa/vavr/src/test/java/example/PersonRepositoryIntegrationTests.java
index d1630f7a..bace6559 100644
--- a/jpa/javaslang/src/test/java/example/PersonRepositoryIntegrationTests.java
+++ b/jpa/vavr/src/test/java/example/PersonRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ package example;
 
 import static org.assertj.core.api.Assertions.*;
 
-import javaslang.collection.Seq;
-import javaslang.control.Option;
+import io.vavr.collection.Seq;
+import io.vavr.control.Option;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,7 +29,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * Integration tests for {@link PersonRepository} showing Javaslang support at repsoitory query methods.
+ * Integration tests for {@link PersonRepository} showing Vavr support at repository query methods.
  * 
  * @author Oliver Gierke
  */