diff --git a/src/main/java/org/springframework/data/jpa/domain/support/Jsr310BackPortJpaConverters.java b/src/main/java/org/springframework/data/jpa/domain/support/ThreeTenBackPortJpaConverters.java
similarity index 79%
rename from src/main/java/org/springframework/data/jpa/domain/support/Jsr310BackPortJpaConverters.java
rename to src/main/java/org/springframework/data/jpa/domain/support/ThreeTenBackPortJpaConverters.java
index 4c73340d6..456a3bd37 100644
--- a/src/main/java/org/springframework/data/jpa/domain/support/Jsr310BackPortJpaConverters.java
+++ b/src/main/java/org/springframework/data/jpa/domain/support/ThreeTenBackPortJpaConverters.java
@@ -20,14 +20,14 @@ import java.util.Date;
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 
-import org.springframework.data.convert.Jsr310BackPortConverters.DateToInstantConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.DateToLocalDateConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.DateToLocalDateTimeConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.DateToLocalTimeConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.InstantToDateConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.LocalDateTimeToDateConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.LocalDateToDateConverter;
-import org.springframework.data.convert.Jsr310BackPortConverters.LocalTimeToDateConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.DateToInstantConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.DateToLocalDateConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.DateToLocalDateTimeConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.DateToLocalTimeConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.InstantToDateConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.LocalDateTimeToDateConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.LocalDateToDateConverter;
+import org.springframework.data.convert.ThreeTenBackPortConverters.LocalTimeToDateConverter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.threeten.bp.Instant;
 import org.threeten.bp.LocalDate;
@@ -42,8 +42,9 @@ import org.threeten.bp.LocalTime;
  * 
  * @author Oliver Gierke
  * @see http://www.threeten.org/threetenbp
+ * @since 1.8
  */
-public class Jsr310BackPortJpaConverters {
+public class ThreeTenBackPortJpaConverters {
 
 	@Converter(autoApply = true)
 	public static class LocalDateConverter implements AttributeConverter<LocalDate, Date> {
diff --git a/src/test/java/org/springframework/data/jpa/domain/support/Jsr310BackPortJpaConvertersIntegrationTests.java b/src/test/java/org/springframework/data/jpa/domain/support/ThreeTenBackPortJpaConvertersIntegrationTests.java
similarity index 86%
rename from src/test/java/org/springframework/data/jpa/domain/support/Jsr310BackPortJpaConvertersIntegrationTests.java
rename to src/test/java/org/springframework/data/jpa/domain/support/ThreeTenBackPortJpaConvertersIntegrationTests.java
index 96a1ab537..2b355b36a 100644
--- a/src/test/java/org/springframework/data/jpa/domain/support/Jsr310BackPortJpaConvertersIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/domain/support/ThreeTenBackPortJpaConvertersIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2015 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.
@@ -30,11 +30,12 @@ import org.threeten.bp.LocalDateTime;
 import org.threeten.bp.LocalTime;
 
 /**
- * Integration tests for {@link Jsr310BackPortJpaConverters}.
+ * Integration tests for {@link ThreeTenBackPortJpaConverters}.
  * 
  * @author Oliver Gierke
+ * @since 1.8
  */
-public class Jsr310BackPortJpaConvertersIntegrationTests extends AbstractAttributeConverterIntegrationTests {
+public class ThreeTenBackPortJpaConvertersIntegrationTests extends AbstractAttributeConverterIntegrationTests {
 
 	@PersistenceContext EntityManager em;
 
@@ -42,7 +43,7 @@ public class Jsr310BackPortJpaConvertersIntegrationTests extends AbstractAttribu
 	 * @see DATAJPA-650
 	 */
 	@Test
-	public void usesJsr310BackPortJpaConverters() {
+	public void usesThreeTenBackPortJpaConverters() {
 
 		assumeTrue(currentEntityManagerIsAJpa21EntityManager(em));