diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java
index 4914843d..230fd8ac 100644
--- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java
+++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java
@@ -47,9 +47,9 @@ import org.springframework.util.Assert;
  */
 public class RepositoryAsyncEventListener<T, ID> implements AsyncEventListener {
 
-	protected static final AsyncEventErrorHandler DEFAULT_EVENT_ERROR_HANDLER = eventError -> false;
+	protected static final AsyncEventErrorHandler DEFAULT_ASYNC_EVENT_ERROR_HANDLER = eventError -> false;
 
-	private AsyncEventErrorHandler asyncEventErrorHandler = DEFAULT_EVENT_ERROR_HANDLER;
+	private AsyncEventErrorHandler asyncEventErrorHandler = DEFAULT_ASYNC_EVENT_ERROR_HANDLER;
 
 	private final CrudRepository<T, ID> repository;
 
@@ -102,7 +102,7 @@ public class RepositoryAsyncEventListener<T, ID> implements AsyncEventListener {
 	 * @see AsyncEventErrorHandler
 	 */
 	protected @NonNull AsyncEventErrorHandler getAsyncEventErrorHandler() {
-		return this.asyncEventErrorHandler != null ? this.asyncEventErrorHandler : DEFAULT_EVENT_ERROR_HANDLER;
+		return this.asyncEventErrorHandler != null ? this.asyncEventErrorHandler : DEFAULT_ASYNC_EVENT_ERROR_HANDLER;
 	}
 
 	/**
@@ -238,7 +238,7 @@ public class RepositoryAsyncEventListener<T, ID> implements AsyncEventListener {
 		public AsyncEventError(@NonNull AsyncEvent<?, ?> event, @NonNull Throwable cause) {
 
 			Assert.notNull(event, "AsyncEvent must not be null");
-			Assert.notNull(cause, "The cause must not be null");
+			Assert.notNull(cause, "Cause must not be null");
 
 			this.event = event;
 			this.cause = cause;
diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java
index be97a7fb..2ccf164c 100644
--- a/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/cache/RepositoryAsyncEventListenerUnitTests.java
@@ -107,7 +107,7 @@ public class RepositoryAsyncEventListenerUnitTests {
 		RepositoryAsyncEventListener listener = new RepositoryAsyncEventListener<>(mockRepository);
 
 		assertThat(listener.getAsyncEventErrorHandler())
-			.isEqualTo(RepositoryAsyncEventListener.DEFAULT_EVENT_ERROR_HANDLER);
+			.isEqualTo(RepositoryAsyncEventListener.DEFAULT_ASYNC_EVENT_ERROR_HANDLER);
 
 		listener.setAsyncEventErrorHandler(mockAsyncEventErrorHandler);
 
@@ -116,7 +116,7 @@ public class RepositoryAsyncEventListenerUnitTests {
 		listener.setAsyncEventErrorHandler(null);
 
 		assertThat(listener.getAsyncEventErrorHandler())
-			.isEqualTo(RepositoryAsyncEventListener.DEFAULT_EVENT_ERROR_HANDLER);
+			.isEqualTo(RepositoryAsyncEventListener.DEFAULT_ASYNC_EVENT_ERROR_HANDLER);
 
 		verifyNoInteractions(mockAsyncEventErrorHandler, mockRepository);
 	}
@@ -412,7 +412,7 @@ public class RepositoryAsyncEventListenerUnitTests {
 		}
 		catch (IllegalArgumentException expected) {
 
-			assertThat(expected).hasMessage("The cause must not be null");
+			assertThat(expected).hasMessage("Cause must not be null");
 			assertThat(expected).hasNoCause();
 
 			throw expected;