diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
index 9b8177bdffeafefe8412eaef7a8247a227c2275e..980204cdae1aa595c1e6896e8f789f5c26f41ba0 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
@@ -25,7 +25,7 @@ import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsFac
 import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsService;
 import org.opengroup.osdu.core.common.service.coreis.HeadersUtil;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.AuthorizationService;
+import org.opengroup.osdu.core.common.spi.coreis.IAuthorizationService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.annotation.RequestScope;
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
 
 @Service
 @RequestScope
-public class AuthorizationServiceEntitlements implements AuthorizationService {
+public class AuthorizationServiceEntitlements implements IAuthorizationService {
 
     private static final String TENANT_GROUP_FORMAT = "@%s";
 
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
index 2cdf3fbd6dc6b00705093bf0091bb44d2f2203ac..60757226cfe6bb3a4ae30513baadf40a6dacf865 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
@@ -4,7 +4,7 @@ import com.google.common.base.Strings;
 import lombok.extern.java.Log;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.coreis.AuthorizationResponse;
-import org.opengroup.osdu.core.common.spi.coreis.AuthorizationService;
+import org.opengroup.osdu.core.common.spi.coreis.IAuthorizationService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 import javax.inject.Inject;
@@ -15,7 +15,7 @@ import javax.inject.Inject;
 public class AuthorizationFilter {
 
     @Inject
-    private AuthorizationService authorizationService;
+    private IAuthorizationService authorizationService;
 
     private DpsHeaders headers;
 
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
index 4b083075c26dafc0ac23638c04c3f069e602bb8a..81b883e162446506554cf5e5632da4bcb8dd1b81 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
@@ -19,9 +19,9 @@ import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
+import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
 import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
+import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -31,9 +31,9 @@ import javax.inject.Inject;
 public class ElasticSettingServiceImpl implements ElasticSettingService {
 
     @Inject
-    private TenantInfoService tenantInfoServiceProvider;
+    private ITenantInfoService tenantInfoServiceProvider;
     @Inject
-    private ElasticRepository elasticRepository;
+    private IElasticRepository elasticRepository;
     @Inject
     private IElasticCredentialsCache elasticCredentialCache;
     @Inject
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingService.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingService.java
index ad1b3d4f2a3dcaf52228412c6117ac5d28682563..75cfcf622b0dc661ccff0452afe90434543666fb 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingService.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingService.java
@@ -15,14 +15,14 @@
 package org.opengroup.osdu.indexer.service;
 
 import org.elasticsearch.client.RestHighLevelClient;
-import org.opengroup.osdu.core.common.service.coreis.MappingService;
+import org.opengroup.osdu.core.common.service.coreis.IMappingService;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
 
-public interface IndexerMappingService extends MappingService {
+public interface IndexerMappingService extends IMappingService {
 
     String createMapping(RestHighLevelClient client, IndexSchema schema, String index, boolean merge) throws IOException;
 
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
index 74637301e1ad423dd0ad29e1830a3327dc02a4a0..a5872dc45b81f5f38c02f51da9a9fdd20ddaeb4b 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
@@ -27,7 +27,7 @@ import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
 import org.opengroup.osdu.core.common.model.indexer.*;
 import org.opengroup.osdu.core.common.model.storage.ConversionStatus;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
+import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
 import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
 import org.apache.http.HttpStatus;
@@ -54,7 +54,7 @@ public class StorageServiceImpl implements StorageService {
     private final Gson gson = new Gson();
 
     @Inject
-    private UrlFetchService urlFetchService;
+    private IUrlFetchService urlFetchService;
     @Inject
     private JobStatus jobStatus;
     @Inject
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java
index e1473a31cef7d8bf6220ff86e4c80b8b9f633964..51e62226b5e59dec3657c4b3e4b88ac2b4a750b1 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/TenantInfoServiceImpl.java
@@ -19,13 +19,13 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
+import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import javax.inject.Inject;
 
 @Component
-public class TenantInfoServiceImpl implements TenantInfoService {
+public class TenantInfoServiceImpl implements ITenantInfoService {
 
     @Inject
     private ITenantFactory tenantFactory;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
index fd724bc3318f5251d9638e5b5770ebb270473b3a..33b39c8c6d69dd655e5e02ad8e9034c7435742bf 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
@@ -21,7 +21,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.coreis.CloudTaskRequest;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
+import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -32,13 +32,13 @@ import javax.inject.Inject;
 import static org.opengroup.osdu.core.common.model.core.Constants.REINDEX_RELATIVE_URL;
 import static org.opengroup.osdu.core.common.model.core.Constants.WORKER_RELATIVE_URL;
 
-@Log
-@Component
-@RequestScope
-public class IndexerQueueTaskBuilder {
+    @Log
+    @Component
+    @RequestScope
+    public class IndexerQueueTaskBuilder {
 
     @Inject
-    private UrlFetchService urlFetchService;
+    private IUrlFetchService urlFetchService;
     @Inject
     private JaxRsDpsLog jaxRsDpsLog;
 
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java
index bd5624bd54223d8fb2086c324226d2edcfac4d61..ef56ebc87e094ea2945f2e6a3284339841986fd3 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java
@@ -22,7 +22,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.core.AuditPayload;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.DpsLog;
+import org.opengroup.osdu.core.common.model.core.IDpsLog;
 import org.opengroup.osdu.core.common.model.core.Request;
 import org.opengroup.osdu.core.common.model.indexer.ServiceLogId;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
@@ -39,11 +39,11 @@ import static org.mockito.Mockito.*;
 
 @Ignore
 @RunWith(SpringRunner.class)
-@PrepareForTest({DpsLog.class})
+@PrepareForTest({IDpsLog.class})
 public class JaxRsDpsLogTest {
 
     @Mock
-    private DpsLog log;
+    private IDpsLog log;
 
     @InjectMocks
     private JaxRsDpsLog sut;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
index ad9ad5a7b0624de7dc9c5278e44d5aedbd9f9eeb..236145bbcd677f36ae63bf9e48ad8e332572140b 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
@@ -24,9 +24,9 @@ import org.opengroup.osdu.indexer.service.ElasticSettingServiceImpl;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
+import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
 import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
+import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -38,9 +38,9 @@ import static org.mockito.Mockito.when;
 public class ElasticSettingServiceTest {
 
     @Mock
-    private TenantInfoService tenantInfoService;
+    private ITenantInfoService tenantInfoService;
     @Mock
-    private ElasticRepository elasticRepository;
+    private IElasticRepository elasticRepository;
     @Mock
     private IElasticCredentialsCache elasticCredentialCache;
     @Mock
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
index f28130bba37a8998fa02633a9cb2c32faf788a51..6f40bdc5f157393da5b5bc6a95385b431b46dabd 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
@@ -33,7 +33,7 @@ import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
+import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -54,7 +54,7 @@ import static org.powermock.api.mockito.PowerMockito.when;
 public class StorageServiceTest {
 
     @Mock
-    private UrlFetchService urlFetchService;
+    private IUrlFetchService urlFetchService;
     @Mock
     private JobStatus jobStatus;
     @Mock
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java
index 5820b3ce3e75a3d00300104d63b1f601870228fc..dc061db69c503464d2894a9fe836b5ec07d80393 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java
@@ -14,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsLog;
+import org.opengroup.osdu.core.common.model.core.IDpsLog;
 import org.opengroup.osdu.core.gcp.logging.logger.AppEngineLoggingProvider;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
@@ -22,17 +22,17 @@ import org.springframework.web.context.annotation.RequestScope;
 
 @Component
 @RequestScope
-public class DpsLogFactory extends AbstractFactoryBean<DpsLog> {
+public class DpsLogFactory extends AbstractFactoryBean<IDpsLog> {
 
     private AppEngineLoggingProvider appEngineLoggingProvider = new AppEngineLoggingProvider();
 
     @Override
-    protected DpsLog createInstance() throws Exception {
+    protected IDpsLog createInstance() throws Exception {
         return appEngineLoggingProvider.getLogger();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return DpsLog.class;
+        return IDpsLog.class;
     }
 }
\ No newline at end of file
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
index 2bdc4cbaef80ac85656ec89a60327cbbc1277864..cb3440b589c9ea07f77a1ff7df0a23d2414d5e49 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
@@ -24,7 +24,7 @@ import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.spi.coreis.IKmsClient;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
+import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -32,7 +32,7 @@ import javax.inject.Inject;
 
 @Log
 @Component
-public class ElasticRepositoryDatastore implements ElasticRepository {
+public class ElasticRepositoryDatastore implements IElasticRepository {
 
     static final String HOST = "host";
     static final String PORT = "port";
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
index de6bd1517e47482410dbdb08077a56e316db7856..c9616ca246198e51d8e32696dd9e5ec45f0da719 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
@@ -24,9 +24,9 @@ import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
+import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
 import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
+import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;
@@ -37,9 +37,9 @@ import static org.mockito.Mockito.when;
 public class ElasticSettingServiceTest {
 
     @Mock
-    private TenantInfoService tenantInfoService;
+    private ITenantInfoService tenantInfoService;
     @Mock
-    private ElasticRepository elasticRepository;
+    private IElasticRepository elasticRepository;
     @Mock
     private IElasticCredentialsCache elasticCredentialCache;
     @Mock
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
index 32b9fe56d84745e58123353d8da950ec578cdc33..9540d086dd75b1c32a74a65652ddad7541bae496 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
@@ -30,7 +30,7 @@ import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
 import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
+import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
 import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
 import org.opengroup.osdu.core.common.model.indexer.Records;
@@ -53,7 +53,7 @@ import static org.powermock.api.mockito.PowerMockito.when;
 public class StorageServiceTest {
 
     @Mock
-    private UrlFetchService urlFetchService;
+    private IUrlFetchService urlFetchService;
     @Mock
     private JobStatus jobStatus;
     @Mock