diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/EventImplQueue.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/EventQueue.java
similarity index 84%
rename from sdk-java/src/main/java/ly/count/sdk/java/internal/EventImplQueue.java
rename to sdk-java/src/main/java/ly/count/sdk/java/internal/EventQueue.java
index 45e74aa5b..654cf0cc3 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/EventImplQueue.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/EventQueue.java
@@ -4,14 +4,14 @@
 import java.util.Collection;
 import java.util.List;
 
-public class EventImplQueue {
+public class EventQueue {
 
     static final String DELIMITER = ":::";
     private final Log L;
     private final InternalConfig config;
     final List<EventImpl> eventQueueMemoryCache;
 
-    protected EventImplQueue(Log logger, InternalConfig config) {
+    protected EventQueue(Log logger, InternalConfig config) {
         L = logger;
         this.config = config;
         eventQueueMemoryCache = new ArrayList<>(config.getEventsBufferSize());
@@ -25,7 +25,7 @@ protected int eqSize() {
     }
 
     void addEvent(final EventImpl event) {
-        L.d("[EventImplQueue] Adding event: " + event.key);
+        L.d("[EventQueue] Adding event: " + event.key);
         if (eventQueueMemoryCache.size() < config.getEventsBufferSize()) {
             eventQueueMemoryCache.add(event);
             writeEventQueueToStorage();
@@ -38,7 +38,7 @@ void addEvent(final EventImpl event) {
     void writeEventQueueToStorage() {
         final String eventQueue = joinEvents(eventQueueMemoryCache);
 
-        L.d("[EventImplQueue] Setting event data: " + eventQueue);
+        L.d("[EventQueue] Setting event data: " + eventQueue);
         SDKCore.instance.sdkStorage.storeEventQueue(eventQueue);
     }
 
@@ -46,7 +46,7 @@ void writeEventQueueToStorage() {
      * Restores events from disk
      */
     void restore() {
-        L.d("[EventImplQueue] Restoring events from disk");
+        L.d("[EventQueue] Restoring events from disk");
         eventQueueMemoryCache.clear();
 
         final String[] array = getEvents();
@@ -67,14 +67,14 @@ private String joinEvents(final Collection<EventImpl> collection) {
         for (EventImpl e : collection) {
             strings.add(e.toJSON(L));
         }
-        return Utils.join(strings, EventImplQueue.DELIMITER);
+        return Utils.join(strings, EventQueue.DELIMITER);
     }
 
     /**
      * Returns an unsorted array of the current stored event JSON strings.
      */
     private synchronized String[] getEvents() {
-        L.d("[EventImplQueue] Getting events from disk");
+        L.d("[EventQueue] Getting events from disk");
         final String joinedEventsStr = SDKCore.instance.sdkStorage.readEventQueue();
         return joinedEventsStr.isEmpty() ? new String[0] : joinedEventsStr.split(DELIMITER);
     }
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleEvents.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleEvents.java
index 36c024faf..28c4275f0 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleEvents.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleEvents.java
@@ -13,7 +13,7 @@
 public class ModuleEvents extends ModuleBase {
 
     protected CtxCore ctx = null;
-    protected EventImplQueue eventQueue = null;
+    protected EventQueue eventQueue = null;
     final Map<String, EventImpl> timedEvents = new HashMap<>();
     private ScheduledExecutorService executor = null;
     protected Events eventsInterface = null;
@@ -22,7 +22,7 @@ public class ModuleEvents extends ModuleBase {
     public void init(InternalConfig config, Log logger) {
         super.init(config, logger);
         L.d("[ModuleEvents] init: config = " + config);
-        eventQueue = new EventImplQueue(L, config);
+        eventQueue = new EventQueue(L, config);
         eventQueue.restore();
         eventsInterface = new Events();
     }
diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java
index b052b1027..ec041d41b 100644
--- a/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/TestUtils.java
@@ -1,20 +1,12 @@
 package ly.count.sdk.java.internal;
 
+import ly.count.sdk.java.Config;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
+import java.util.*;
 import java.util.stream.Stream;
-import ly.count.sdk.java.Config;
 
-import static ly.count.sdk.java.internal.SDKStorage.EVENT_QUEUE_FILE_NAME;
-import static ly.count.sdk.java.internal.SDKStorage.FILE_NAME_PREFIX;
-import static ly.count.sdk.java.internal.SDKStorage.FILE_NAME_SEPARATOR;
+import static ly.count.sdk.java.internal.SDKStorage.*;
 
 public class TestUtils {
     static String SERVER_URL = "https://test.count.ly";
@@ -105,7 +97,7 @@ protected static List<EventImpl> getCurrentEventQueue(File targetFolder, Log log
             //do nothing
         }
 
-        Arrays.stream(fileContent.split(EventImplQueue.DELIMITER)).forEach(s -> {
+        Arrays.stream(fileContent.split(EventQueue.DELIMITER)).forEach(s -> {
             final EventImpl event = EventImpl.fromJSON(s, (ev) -> {
             }, logger);
             if (event != null) {