diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexFilter.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java
similarity index 93%
rename from indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexFilter.java
rename to indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java
index 0acdc656c660b0ed37eaf09fe4bef4cbe6d58165..633179c426acd8ed830568b1926821b9c0e77b7d 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexFilter.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java
@@ -16,12 +16,12 @@ import org.springframework.stereotype.Component;
 
 @Log
 @Component
-public class IndexFilter implements Filter {
+public class IndexerFilter implements Filter {
 
     private final DpsHeaders dpsHeaders;
 
     @Autowired
-    public IndexFilter(DpsHeaders dpsHeaders) {
+    public IndexerFilter(DpsHeaders dpsHeaders) {
         this.dpsHeaders = dpsHeaders;
     }
 
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexFilterTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexerFilterTest.java
similarity index 86%
rename from indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexFilterTest.java
rename to indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexerFilterTest.java
index d404aa9dd06bd157d031f007a4e226091fc48892..9d73609676d11b1c91c8c2c21b9874f2015efe9e 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexFilterTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexerFilterTest.java
@@ -15,13 +15,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
-import java.util.Collections;
 
 @RunWith(MockitoJUnitRunner.class)
-public class IndexFilterTest {
+public class IndexerFilterTest {
+
 
     @InjectMocks
-    private IndexFilter indexFilter;
+    private IndexerFilter indexerFilter;
 
     @Mock
     private DpsHeaders dpsHeaders;
@@ -34,7 +34,7 @@ public class IndexFilterTest {
 
         Mockito.when(dpsHeaders.getCorrelationId()).thenReturn("correlation-id-value");
 
-        indexFilter.doFilter(httpServletRequest, httpServletResponse, filterChain);
+        indexerFilter.doFilter(httpServletRequest, httpServletResponse, filterChain);
 
         Mockito.verify(httpServletResponse).addHeader("correlation-id", "correlation-id-value");
         Mockito.verify(filterChain).doFilter(httpServletRequest, httpServletResponse);