diff --git a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java
index c88434207..354ccb4ec 100644
--- a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java
+++ b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java
@@ -105,8 +105,8 @@ public abstract class QueryExecutionConverters {
 		}
 
 		if (JAVASLANG_PRESENT) {
-			WRAPPER_TYPES.add(NullableWrapperToJavaSlangOptionConverter.getWrapperType());
-			UNWRAPPERS.add(JavaSlangOptionUnwrapper.INSTANCE);
+			WRAPPER_TYPES.add(NullableWrapperToJavaslangOptionConverter.getWrapperType());
+			UNWRAPPERS.add(JavaslangOptionUnwrapper.INSTANCE);
 		}
 
 		if (ReactiveWrappers.isAvailable()) {
@@ -179,7 +179,7 @@ public abstract class QueryExecutionConverters {
 		}
 
 		if (JAVASLANG_PRESENT) {
-			conversionService.addConverter(new NullableWrapperToJavaSlangOptionConverter(conversionService));
+			conversionService.addConverter(new NullableWrapperToJavaslangOptionConverter(conversionService));
 		}
 
 		conversionService.addConverter(new NullableWrapperToFutureConverter(conversionService));
@@ -426,7 +426,7 @@ public abstract class QueryExecutionConverters {
 	 * @author Oliver Gierke
 	 * @since 1.13
 	 */
-	private static class NullableWrapperToJavaSlangOptionConverter extends AbstractWrapperTypeConverter {
+	private static class NullableWrapperToJavaslangOptionConverter extends AbstractWrapperTypeConverter {
 
 		private static final Method OF_METHOD;
 		private static final Method NONE_METHOD;
@@ -437,11 +437,11 @@ public abstract class QueryExecutionConverters {
 		}
 
 		/**
-		 * Creates a new {@link NullableWrapperToJavaSlangOptionConverter} using the given {@link ConversionService}.
+		 * Creates a new {@link NullableWrapperToJavaslangOptionConverter} using the given {@link ConversionService}.
 		 * 
 		 * @param conversionService must not be {@literal null}.
 		 */
-		public NullableWrapperToJavaSlangOptionConverter(ConversionService conversionService) {
+		public NullableWrapperToJavaslangOptionConverter(ConversionService conversionService) {
 			super(conversionService, createEmptyOption(), getWrapperType());
 		}
 
@@ -539,12 +539,12 @@ public abstract class QueryExecutionConverters {
 	}
 
 	/**
-	 * Converter to unwrap JavaSlang {@link javaslang.control.Option} instances.
+	 * Converter to unwrap Javaslang {@link javaslang.control.Option} instances.
 	 *
 	 * @author Oliver Gierke
 	 * @since 1.13
 	 */
-	private static enum JavaSlangOptionUnwrapper implements Converter<Object, Object> {
+	private static enum JavaslangOptionUnwrapper implements Converter<Object, Object> {
 
 		INSTANCE;
 
diff --git a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
index 5f1d2b2c0..98580224e 100644
--- a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
@@ -228,7 +228,7 @@ public class QueryExecutionConvertersUnitTests {
 	 * @see DATACMNS-937
 	 */
 	@Test
-	public void turnsNullIntoJavaSlangOption() {
+	public void turnsNullIntoJavaslangOption() {
 		assertThat(conversionService.convert(new NullableWrapper(null), javaslang.control.Option.class),
 				is((Object) optionNone()));
 	}
@@ -237,7 +237,7 @@ public class QueryExecutionConvertersUnitTests {
 	 * @see DATACMNS-937
 	 */
 	@Test
-	public void wrapsValueIntoJavaSlangOption() {
+	public void wrapsValueIntoJavaslangOption() {
 
 		javaslang.control.Option<?> result = conversionService.convert(new NullableWrapper("string"),
 				javaslang.control.Option.class);
@@ -250,7 +250,7 @@ public class QueryExecutionConvertersUnitTests {
 	 * @see DATACMNS-937
 	 */
 	@Test
-	public void unwrapsEmptyJavaSlangOption() {
+	public void unwrapsEmptyJavaslangOption() {
 		assertThat(QueryExecutionConverters.unwrap(optionNone()), is(nullValue()));
 	}
 
@@ -258,7 +258,7 @@ public class QueryExecutionConvertersUnitTests {
 	 * @see DATACMNS-937
 	 */
 	@Test
-	public void unwrapsJavaSlangOption() {
+	public void unwrapsJavaslangOption() {
 		assertThat(QueryExecutionConverters.unwrap(option("string")), is((Object) "string"));
 	}