diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/PluginLoader.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/PluginLoader.java
index 3c25df873a..ec5e0136f2 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/PluginLoader.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/PluginLoader.java
@@ -26,7 +26,7 @@
 import ai.startree.thirdeye.rootcause.ContributorsFinderRunner;
 import ai.startree.thirdeye.spi.Plugin;
 import ai.startree.thirdeye.spi.PluginClassLoader;
-import ai.startree.thirdeye.spi.accessControl.AccessControlFactory;
+import ai.startree.thirdeye.spi.auth.AccessControlFactory;
 import ai.startree.thirdeye.spi.auth.Authenticator.OauthAuthenticatorFactory;
 import ai.startree.thirdeye.spi.auth.OpenIdConfigurationProvider;
 import ai.startree.thirdeye.spi.bootstrap.BootstrapResourcesProviderFactory;
diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/ThirdEyeServerModule.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/ThirdEyeServerModule.java
index 56463dcf05..69d22b2dda 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/ThirdEyeServerModule.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/ThirdEyeServerModule.java
@@ -21,7 +21,7 @@
 import ai.startree.thirdeye.notification.ThirdEyeNotificationModule;
 import ai.startree.thirdeye.scheduler.ThirdEyeSchedulerModule;
 import ai.startree.thirdeye.scheduler.events.MockEventsConfiguration;
-import ai.startree.thirdeye.spi.accessControl.AccessControl;
+import ai.startree.thirdeye.spi.auth.AccessControl;
 import ai.startree.thirdeye.worker.ThirdEyeWorkerModule;
 import com.codahale.metrics.MetricRegistry;
 import com.google.inject.AbstractModule;
diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AccessControlProvider.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AccessControlProvider.java
index e2f4f5ce38..5f33641c03 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AccessControlProvider.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AccessControlProvider.java
@@ -15,10 +15,10 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-import ai.startree.thirdeye.spi.accessControl.AccessControl;
-import ai.startree.thirdeye.spi.accessControl.AccessControlFactory;
-import ai.startree.thirdeye.spi.accessControl.AccessType;
-import ai.startree.thirdeye.spi.accessControl.ResourceIdentifier;
+import ai.startree.thirdeye.spi.auth.AccessControl;
+import ai.startree.thirdeye.spi.auth.AccessControlFactory;
+import ai.startree.thirdeye.spi.auth.AccessType;
+import ai.startree.thirdeye.spi.auth.ResourceIdentifier;
 
 /**
  * AccessControlProvider serves as a mutable layer between Guice bindings and the access control
@@ -41,17 +41,17 @@ public class AccessControlProvider implements AccessControl {
   private final AccessControlConfiguration config;
   private AccessControl accessControl = null;
 
-  public AccessControlProvider(AccessControlConfiguration config) {
+  public AccessControlProvider(final AccessControlConfiguration config) {
     this.config = config;
   }
 
-  public void addAccessControlFactory(AccessControlFactory f) {
+  public void addAccessControlFactory(final AccessControlFactory f) {
     // No lazy-loading here. Immediately build the access control handler.
     if (!config.isEnabled()) {
       return;
     }
 
-    var accessControl = f.build(config.getPlugins().get(f.getName()));
+    final var accessControl = f.build(config.getPlugins().get(f.getName()));
     if (accessControl == null) {
       return;
     }
diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AuthorizationManager.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AuthorizationManager.java
index f8100ac3e1..7ba8f7d43a 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AuthorizationManager.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/AuthorizationManager.java
@@ -13,16 +13,16 @@
  */
 package ai.startree.thirdeye.auth;
 
-import static ai.startree.thirdeye.spi.accessControl.ResourceIdentifier.DEFAULT_ENTITY_TYPE;
-import static ai.startree.thirdeye.spi.accessControl.ResourceIdentifier.DEFAULT_NAME;
+import static ai.startree.thirdeye.spi.auth.ResourceIdentifier.DEFAULT_ENTITY_TYPE;
+import static ai.startree.thirdeye.spi.auth.ResourceIdentifier.DEFAULT_NAME;
 import static ai.startree.thirdeye.spi.util.SpiUtils.optional;
 
 import ai.startree.thirdeye.alert.AlertTemplateRenderer;
 import ai.startree.thirdeye.auth.ThirdEyePrincipal.AuthenticationType;
 import ai.startree.thirdeye.datalayer.dao.SubEntities;
-import ai.startree.thirdeye.spi.accessControl.AccessControl;
-import ai.startree.thirdeye.spi.accessControl.AccessType;
-import ai.startree.thirdeye.spi.accessControl.ResourceIdentifier;
+import ai.startree.thirdeye.spi.auth.AccessControl;
+import ai.startree.thirdeye.spi.auth.AccessType;
+import ai.startree.thirdeye.spi.auth.ResourceIdentifier;
 import ai.startree.thirdeye.spi.datalayer.dto.AbstractDTO;
 import ai.startree.thirdeye.spi.datalayer.dto.AlertDTO;
 import ai.startree.thirdeye.spi.datalayer.dto.AlertTemplateDTO;
diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/NamespaceResolver.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/NamespaceResolver.java
index 0a252cf622..ebd38d5361 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/NamespaceResolver.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/auth/NamespaceResolver.java
@@ -13,7 +13,7 @@
  */
 package ai.startree.thirdeye.auth;
 
-import static ai.startree.thirdeye.spi.accessControl.ResourceIdentifier.DEFAULT_NAMESPACE;
+import static ai.startree.thirdeye.spi.auth.ResourceIdentifier.DEFAULT_NAMESPACE;
 import static ai.startree.thirdeye.spi.util.SpiUtils.optional;
 
 import ai.startree.thirdeye.spi.datalayer.bao.AlertManager;
diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/service/AlertService.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/service/AlertService.java
index 6a412ab76b..09197d18b9 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/service/AlertService.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/service/AlertService.java
@@ -29,7 +29,6 @@
 import ai.startree.thirdeye.auth.AuthorizationManager;
 import ai.startree.thirdeye.auth.ThirdEyePrincipal;
 import ai.startree.thirdeye.mapper.ApiBeanMapper;
-import ai.startree.thirdeye.spi.accessControl.AccessType;
 import ai.startree.thirdeye.spi.api.AlertApi;
 import ai.startree.thirdeye.spi.api.AlertEvaluationApi;
 import ai.startree.thirdeye.spi.api.AlertInsightsApi;
@@ -37,6 +36,7 @@
 import ai.startree.thirdeye.spi.api.AnomalyStatsApi;
 import ai.startree.thirdeye.spi.api.DetectionEvaluationApi;
 import ai.startree.thirdeye.spi.api.UserApi;
+import ai.startree.thirdeye.spi.auth.AccessType;
 import ai.startree.thirdeye.spi.datalayer.Predicate;
 import ai.startree.thirdeye.spi.datalayer.bao.AlertManager;
 import ai.startree.thirdeye.spi.datalayer.dto.AlertDTO;
diff --git a/thirdeye-server/src/main/java/ai/startree/thirdeye/service/CrudService.java b/thirdeye-server/src/main/java/ai/startree/thirdeye/service/CrudService.java
index 5ea54e60b5..79632d217d 100644
--- a/thirdeye-server/src/main/java/ai/startree/thirdeye/service/CrudService.java
+++ b/thirdeye-server/src/main/java/ai/startree/thirdeye/service/CrudService.java
@@ -29,9 +29,9 @@
 import ai.startree.thirdeye.RequestCache;
 import ai.startree.thirdeye.auth.AuthorizationManager;
 import ai.startree.thirdeye.auth.ThirdEyePrincipal;
-import ai.startree.thirdeye.spi.accessControl.AccessType;
 import ai.startree.thirdeye.spi.api.CountApi;
 import ai.startree.thirdeye.spi.api.ThirdEyeCrudApi;
+import ai.startree.thirdeye.spi.auth.AccessType;
 import ai.startree.thirdeye.spi.datalayer.DaoFilter;
 import ai.startree.thirdeye.spi.datalayer.Predicate;
 import ai.startree.thirdeye.spi.datalayer.bao.AbstractManager;
@@ -93,7 +93,7 @@ public ApiT findByName(
     if (byName.size() > 1) {
       throw serverError(ERR_UNKNOWN, "Error. Multiple objects with name: " + name);
     }
-    DtoT dtoT = byName.iterator().next();
+    final DtoT dtoT = byName.iterator().next();
     authorizationManager.ensureCanRead(principal, dtoT);
     return toApi(dtoT, cache);
   }
@@ -294,7 +294,7 @@ protected void postUpdate(final DtoT dto) {
     // default is a no-op
   }
 
-  protected void deleteDto(DtoT dto) {
+  protected void deleteDto(final DtoT dto) {
     dtoManager.delete(dto);
   }
 }
diff --git a/thirdeye-server/src/test/java/ai/startree/thirdeye/auth/AuthorizationManagerTest.java b/thirdeye-server/src/test/java/ai/startree/thirdeye/auth/AuthorizationManagerTest.java
index aecf8c09cb..1d53300ce7 100644
--- a/thirdeye-server/src/test/java/ai/startree/thirdeye/auth/AuthorizationManagerTest.java
+++ b/thirdeye-server/src/test/java/ai/startree/thirdeye/auth/AuthorizationManagerTest.java
@@ -17,7 +17,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import ai.startree.thirdeye.spi.accessControl.ResourceIdentifier;
+import ai.startree.thirdeye.spi.auth.ResourceIdentifier;
 import ai.startree.thirdeye.spi.datalayer.bao.AlertManager;
 import ai.startree.thirdeye.spi.datalayer.bao.EnumerationItemManager;
 import ai.startree.thirdeye.spi.datalayer.dto.AlertDTO;
diff --git a/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/AlertResourceTest.java b/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/AlertResourceTest.java
index ab932559a3..a133dc6d60 100644
--- a/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/AlertResourceTest.java
+++ b/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/AlertResourceTest.java
@@ -30,9 +30,6 @@
 import ai.startree.thirdeye.auth.ThirdEyePrincipal.AuthenticationType;
 import ai.startree.thirdeye.service.AlertService;
 import ai.startree.thirdeye.service.AppAnalyticsService;
-import ai.startree.thirdeye.spi.accessControl.AccessControl;
-import ai.startree.thirdeye.spi.accessControl.AccessType;
-import ai.startree.thirdeye.spi.accessControl.ResourceIdentifier;
 import ai.startree.thirdeye.spi.api.AlertApi;
 import ai.startree.thirdeye.spi.api.AlertEvaluationApi;
 import ai.startree.thirdeye.spi.api.AlertTemplateApi;
@@ -40,6 +37,9 @@
 import ai.startree.thirdeye.spi.api.DetectionEvaluationApi;
 import ai.startree.thirdeye.spi.api.EnumerationItemApi;
 import ai.startree.thirdeye.spi.api.PlanNodeApi;
+import ai.startree.thirdeye.spi.auth.AccessControl;
+import ai.startree.thirdeye.spi.auth.AccessType;
+import ai.startree.thirdeye.spi.auth.ResourceIdentifier;
 import ai.startree.thirdeye.spi.datalayer.bao.AlertManager;
 import ai.startree.thirdeye.spi.datalayer.bao.AlertTemplateManager;
 import ai.startree.thirdeye.spi.datalayer.dto.AlertDTO;
@@ -299,7 +299,7 @@ public void testEvaluate_withExistingAlertAndReadAccessToAlertAndPartialAccessTo
                 accessType == AccessType.READ && id.getNamespace().equals("allowedNamespace")))
     );
 
-    try (Response resp = alertResource.evaluate(nobody(), alertEvaluationApi)) {
+    try (final Response resp = alertResource.evaluate(nobody(), alertEvaluationApi)) {
       assertThat(resp.getStatus()).isEqualTo(200);
 
       final var results = ((AlertEvaluationApi) resp.getEntity());
@@ -393,7 +393,7 @@ public void testEvaluate_withNewAlertAndWriteAccessToAlertAndPartialAccessToEnum
                 id.getNamespace().equals("allowedNamespace")))
     );
 
-    try (Response resp = resource.evaluate(nobody(), alertEvaluationApi)) {
+    try (final Response resp = resource.evaluate(nobody(), alertEvaluationApi)) {
       assertThat(resp.getStatus()).isEqualTo(200);
 
       final var results = ((AlertEvaluationApi) resp.getEntity());
diff --git a/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/CrudResourceTest.java b/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/CrudResourceTest.java
index 060501ef2f..3709c0049f 100644
--- a/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/CrudResourceTest.java
+++ b/thirdeye-server/src/test/java/ai/startree/thirdeye/resources/CrudResourceTest.java
@@ -28,10 +28,10 @@
 import ai.startree.thirdeye.datalayer.bao.AbstractManagerImpl;
 import ai.startree.thirdeye.datalayer.dao.GenericPojoDao;
 import ai.startree.thirdeye.service.CrudService;
-import ai.startree.thirdeye.spi.accessControl.AccessControl;
-import ai.startree.thirdeye.spi.accessControl.AccessType;
-import ai.startree.thirdeye.spi.accessControl.ResourceIdentifier;
 import ai.startree.thirdeye.spi.api.ThirdEyeCrudApi;
+import ai.startree.thirdeye.spi.auth.AccessControl;
+import ai.startree.thirdeye.spi.auth.AccessType;
+import ai.startree.thirdeye.spi.auth.ResourceIdentifier;
 import ai.startree.thirdeye.spi.datalayer.bao.AbstractManager;
 import ai.startree.thirdeye.spi.datalayer.dto.AbstractDTO;
 import com.google.common.collect.ImmutableMap;
diff --git a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/Plugin.java b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/Plugin.java
index 62f5645d49..162fe83b8e 100644
--- a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/Plugin.java
+++ b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/Plugin.java
@@ -13,7 +13,7 @@
  */
 package ai.startree.thirdeye.spi;
 
-import ai.startree.thirdeye.spi.accessControl.AccessControlFactory;
+import ai.startree.thirdeye.spi.auth.AccessControlFactory;
 import ai.startree.thirdeye.spi.auth.Authenticator.OauthAuthenticatorFactory;
 import ai.startree.thirdeye.spi.auth.OpenIdConfigurationProvider;
 import ai.startree.thirdeye.spi.bootstrap.BootstrapResourcesProviderFactory;
diff --git a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessControl.java b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessControl.java
similarity index 93%
rename from thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessControl.java
rename to thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessControl.java
index 5e05f93d9c..e5f99aacea 100644
--- a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessControl.java
+++ b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessControl.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.accessControl;
+package ai.startree.thirdeye.spi.auth;
 
 public interface AccessControl {
 
diff --git a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessControlFactory.java b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessControlFactory.java
similarity index 94%
rename from thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessControlFactory.java
rename to thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessControlFactory.java
index 22c6437c96..6353646eb2 100644
--- a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessControlFactory.java
+++ b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessControlFactory.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.accessControl;
+package ai.startree.thirdeye.spi.auth;
 
 import ai.startree.thirdeye.spi.PluginServiceFactory;
 import java.util.Map;
diff --git a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessType.java b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessType.java
similarity index 92%
rename from thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessType.java
rename to thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessType.java
index d25579bb72..06fccdafc3 100644
--- a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/AccessType.java
+++ b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/AccessType.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.accessControl;
+package ai.startree.thirdeye.spi.auth;
 
 public enum AccessType {
   READ, WRITE
diff --git a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/ResourceIdentifier.java b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/ResourceIdentifier.java
similarity index 97%
rename from thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/ResourceIdentifier.java
rename to thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/ResourceIdentifier.java
index 0feb526a90..88dddf5a40 100644
--- a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/accessControl/ResourceIdentifier.java
+++ b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/auth/ResourceIdentifier.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.accessControl;
+package ai.startree.thirdeye.spi.auth;
 
 import static ai.startree.thirdeye.spi.util.SpiUtils.optional;