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 82ccd20cf9..f182ee87d6 100644
--- a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java
+++ b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java
@@ -96,8 +96,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);
 		}
 	}
 
@@ -145,7 +145,7 @@ public static void registerConvertersIn(ConfigurableConversionService conversion
 		}
 
 		if (JAVASLANG_PRESENT) {
-			conversionService.addConverter(new NullableWrapperToJavaSlangOptionConverter(conversionService));
+			conversionService.addConverter(new NullableWrapperToJavaslangOptionConverter(conversionService));
 		}
 
 		conversionService.addConverter(new NullableWrapperToFutureConverter(conversionService));
@@ -392,7 +392,7 @@ public static Class<?> getWrapperType() {
 	 * @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;
@@ -403,11 +403,11 @@ private static class NullableWrapperToJavaSlangOptionConverter extends AbstractW
 		}
 
 		/**
-		 * 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());
 		}
 
@@ -505,12 +505,12 @@ public Object convert(Object source) {
 	}
 
 	/**
-	 * 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 6034dd842a..58fbd89ad4 100644
--- a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
@@ -201,7 +201,7 @@ public void unwrapsEmptyJavaSlangOption() {
 	 * @see DATACMNS-937
 	 */
 	@Test
-	public void unwrapsJavaSlangOption() {
+	public void unwrapsJavaslangOption() {
 		assertThat(QueryExecutionConverters.unwrap(option("string")), is((Object) "string"));
 	}