diff --git a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
index fb66a0399..46dffcace 100644
--- a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
@@ -38,7 +38,7 @@ public final class BatchEventProcessor<T>
     private ExceptionHandler<? super T> exceptionHandler;
     private final DataProvider<T> dataProvider;
     private final SequenceBarrier sequenceBarrier;
-    private final BaseEventHandler<? super T> eventHandler;
+    private final EventHandlerBase<? super T> eventHandler;
     private final int batchLimitOffset;
     private final Sequence sequence = new Sequence(Sequencer.INITIAL_CURSOR_VALUE);
     private BatchRewindStrategy batchRewindStrategy = new SimpleBatchRewindStrategy();
@@ -48,7 +48,7 @@ public final class BatchEventProcessor<T>
     private BatchEventProcessor(
             final DataProvider<T> dataProvider,
             final SequenceBarrier sequenceBarrier,
-            final BaseEventHandler<? super T> eventHandler,
+            final EventHandlerBase<? super T> eventHandler,
             final int maxBatchSize,
             final boolean rewindable
     )
diff --git a/src/main/java/com/lmax/disruptor/EventHandler.java b/src/main/java/com/lmax/disruptor/EventHandler.java
index b30192c11..c23306df7 100644
--- a/src/main/java/com/lmax/disruptor/EventHandler.java
+++ b/src/main/java/com/lmax/disruptor/EventHandler.java
@@ -21,7 +21,7 @@
  * @param <T> event implementation storing the data for sharing during exchange or parallel coordination of an event.
  * @see BatchEventProcessor#setExceptionHandler(ExceptionHandler) if you want to handle exceptions propagated out of the handler.
  */
-public interface EventHandler<T> extends BaseEventHandler<T>
+public interface EventHandler<T> extends EventHandlerBase<T>
 {
     /**
      * Called when a publisher has published an event to the {@link RingBuffer}.  The {@link BatchEventProcessor} will
diff --git a/src/main/java/com/lmax/disruptor/BaseEventHandler.java b/src/main/java/com/lmax/disruptor/EventHandlerBase.java
similarity index 98%
rename from src/main/java/com/lmax/disruptor/BaseEventHandler.java
rename to src/main/java/com/lmax/disruptor/EventHandlerBase.java
index 64eb54fe1..2ed0db9f6 100644
--- a/src/main/java/com/lmax/disruptor/BaseEventHandler.java
+++ b/src/main/java/com/lmax/disruptor/EventHandlerBase.java
@@ -15,7 +15,7 @@
  */
 package com.lmax.disruptor;
 
-interface BaseEventHandler<T>
+interface EventHandlerBase<T>
 {
     /**
      * Called when a publisher has published an event to the {@link RingBuffer}.  The {@link BatchEventProcessor} will
diff --git a/src/main/java/com/lmax/disruptor/RewindableEventHandler.java b/src/main/java/com/lmax/disruptor/RewindableEventHandler.java
index b485dc256..058828b30 100644
--- a/src/main/java/com/lmax/disruptor/RewindableEventHandler.java
+++ b/src/main/java/com/lmax/disruptor/RewindableEventHandler.java
@@ -22,7 +22,7 @@
  * @param <T> event implementation storing the data for sharing during exchange or parallel coordination of an event.
  * @see BatchEventProcessor#setExceptionHandler(ExceptionHandler) if you want to handle exceptions propagated out of the handler.
  */
-public interface RewindableEventHandler<T> extends BaseEventHandler<T>
+public interface RewindableEventHandler<T> extends EventHandlerBase<T>
 {
     /**
      * Called when a publisher has published an event to the {@link RingBuffer}.  The {@link BatchEventProcessor} will